summaryrefslogtreecommitdiffstats
path: root/src/delta
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-11-29 16:49:30 +0100
committerLennart Poettering <lennart@poettering.net>2016-12-01 00:25:51 +0100
commitc4f4fce79e157800212f3cba1b21870097030e81 (patch)
treef5ef8b7fb1d3b6de637570ee3ddb1157e151b87e /src/delta
parentfs-util: change chase_symlinks() behaviour in regards to escaping the root dir (diff)
downloadsystemd-c4f4fce79e157800212f3cba1b21870097030e81.tar.xz
systemd-c4f4fce79e157800212f3cba1b21870097030e81.zip
fs-util: add flags parameter to chase_symlinks()
Let's remove chase_symlinks_prefix() and instead introduce a flags parameter to chase_symlinks(), with a flag CHASE_PREFIX_ROOT that exposes the behaviour of chase_symlinks_prefix().
Diffstat (limited to 'src/delta')
-rw-r--r--src/delta/delta.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 70ff793304..107b105fde 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -89,11 +89,11 @@ static int equivalent(const char *a, const char *b) {
_cleanup_free_ char *x = NULL, *y = NULL;
int r;
- r = chase_symlinks(a, NULL, &x);
+ r = chase_symlinks(a, NULL, 0, &x);
if (r < 0)
return r;
- r = chase_symlinks(b, NULL, &y);
+ r = chase_symlinks(b, NULL, 0, &y);
if (r < 0)
return r;
@@ -361,7 +361,7 @@ static int should_skip_prefix(const char* p) {
int r;
_cleanup_free_ char *target = NULL;
- r = chase_symlinks(p, NULL, &target);
+ r = chase_symlinks(p, NULL, 0, &target);
if (r < 0)
return r;