From a9d041fa47bed53cc324462726af20007a72ad27 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 7 Dec 2017 21:17:56 +0100 Subject: [PATCH] delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- src/delta/delta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- 2.47.3