path-util: Add hidden suffixes for ucf (#3131)

[elogind.git] / src / basic / path-util.c

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 8d722bd2e7243fd7dc77b6e577fb46d01b4f3b74..5f4252f48cfe7d86ece820d592ed21dd336e05bd 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-

 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.
 


@@ -34,16 +32,16 @@
 #undef basename
 
 #include "alloc-util.h"
 #undef basename
 
 #include "alloc-util.h"

+#include "extract-word.h"

 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "path-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "path-util.h"

-#include "extract-word.h"
-#include "time-util.h"

 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"

+#include "time-util.h"

 
 bool path_is_absolute(const char *p) {
         return p[0] == '/';
 
 bool path_is_absolute(const char *p) {
         return p[0] == '/';


@@ -576,10 +574,10 @@ static int binary_is_good(const char *binary) {
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        return !path_equal(d, "true") &&
-               !path_equal(d, "/bin/true") &&
-               !path_equal(d, "/usr/bin/true") &&
-               !path_equal(d, "/dev/null");
+        return !PATH_IN_SET(d, "true"
+                               "/bin/true",
+                               "/usr/bin/true",
+                               "/dev/null");

 }
 
 int fsck_exists(const char *fstype) {
 }
 
 int fsck_exists(const char *fstype) {


@@ -782,6 +780,9 @@ bool hidden_file_allow_backup(const char *filename) {
                 endswith(filename, ".dpkg-bak") ||
                 endswith(filename, ".dpkg-backup") ||
                 endswith(filename, ".dpkg-remove") ||
                 endswith(filename, ".dpkg-bak") ||
                 endswith(filename, ".dpkg-backup") ||
                 endswith(filename, ".dpkg-remove") ||

+                endswith(filename, ".ucf-new") ||
+                endswith(filename, ".ucf-old") ||
+                endswith(filename, ".ucf-dist") ||

                 endswith(filename, ".swp");
 }
 
                 endswith(filename, ".swp");
 }