From: Franck Bui Date: Thu, 7 Dec 2017 20:17:56 +0000 (+0100) Subject: delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX X-Git-Tag: v237~99^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9d041fa47bed53cc324462726af20007a72ad27;p=thirdparty%2Fsystemd.git delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX Before this patch, when systemd-delta was asked for overwritten configuration files in a directory specified by PREFIX/SUFFIX, it ignored the given PREFIX and listed all overwritten files matching the subdirectory specified by SUFFIX. Hence we could get the following: $ ./build/systemd-delta /usr/local/lib/systemd/system [REDIRECTED] /etc/systemd/system/default.target → /usr/lib/systemd/system/default.target [EXTENDED] /usr/lib/systemd/system/systemd-sysctl.service → /usr/lib/systemd/system/systemd-sysctl.service.d/50-kernel-uname_r.conf systemd-delta showed overwritten configuration files in /usr/lib whereas only overwritten ones in /usr/local/lib should have been reported (none in my case). With the patch applied, we now get: $ ./build/systemd-delta /usr/local/lib/systemd/system 0 overridden configuration files found. --- diff --git a/src/delta/delta.c b/src/delta/delta.c index 6d99d75d3df..9c8841d46de 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -528,7 +528,7 @@ static int process_suffix_chop(const char *arg) { if (suffix) { suffix += strspn(suffix, "/"); if (*suffix) - return process_suffix(suffix, NULL); + return process_suffix(suffix, p); else return process_suffixes(arg); }