delta.c: use _cleanup_

[elogind.git] / src / delta / delta.c

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 65e720e4eb9165bf1e14105e53c56eb9a851b3ff..cc3420829ae2d1e9615606cd6ca52b7a0d135c88 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -33,30 +33,75 @@
 #include "build.h"
 
 static bool arg_no_pager = false;
 #include "build.h"
 
 static bool arg_no_pager = false;

+static int arg_diff = -1;
+
+static enum {
+        SHOW_MASKED = 1 << 0,
+        SHOW_EQUIVALENT = 1 << 1,
+        SHOW_REDIRECTED = 1 << 2,
+        SHOW_OVERRIDDEN = 1 << 3,
+        SHOW_UNCHANGED = 1 << 4,
+
+        SHOW_DEFAULTS =
+        (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN)
+} arg_flags = 0;

 
 static int equivalent(const char *a, const char *b) {
 
 static int equivalent(const char *a, const char *b) {

-        char *x, *y;
-        int r;
+        _cleanup_free_ char *x = NULL, *y = NULL;

 
         x = canonicalize_file_name(a);
         if (!x)
                 return -errno;
 
         y = canonicalize_file_name(b);
 
         x = canonicalize_file_name(a);
         if (!x)
                 return -errno;
 
         y = canonicalize_file_name(b);

-        if (!y) {
-                free(x);
+        if (!y)

                 return -errno;
                 return -errno;

-        }

 
 

-        r = path_equal(x, y);
-        free(x);
-        free(y);
+        return path_equal(x, y);
+}
+
+static int notify_override_masked(const char *top, const char *bottom) {
+        if (!(arg_flags & SHOW_MASKED))
+                return 0;
+
+        printf(ANSI_HIGHLIGHT_RED_ON "[MASKED]" ANSI_HIGHLIGHT_OFF "     %s → %s\n", top, bottom);
+        return 1;
+}
+
+static int notify_override_equivalent(const char *top, const char *bottom) {
+        if (!(arg_flags & SHOW_EQUIVALENT))
+                return 0;
+
+        printf(ANSI_HIGHLIGHT_GREEN_ON "[EQUIVALENT]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
+        return 1;
+}
+
+static int notify_override_redirected(const char *top, const char *bottom) {
+        if (!(arg_flags & SHOW_REDIRECTED))
+                return 0;
+
+        printf(ANSI_HIGHLIGHT_ON "[REDIRECTED]" ANSI_HIGHLIGHT_OFF "   %s → %s\n", top, bottom);
+        return 1;
+}
+
+static int notify_override_overridden(const char *top, const char *bottom) {
+        if (!(arg_flags & SHOW_OVERRIDDEN))
+                return 0;
+
+        printf(ANSI_HIGHLIGHT_ON "[OVERRIDDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
+        return 1;
+}
+
+static int notify_override_unchanged(const char *f) {
+        if (!(arg_flags & SHOW_UNCHANGED))
+                return 0;

 
 

-        return r;
+        printf("[UNCHANGED]  %s\n", f);
+        return 1;

 }
 
 static int found_override(const char *top, const char *bottom) {
 }
 
 static int found_override(const char *top, const char *bottom) {

-        char *dest;
+        _cleanup_free_ char *dest = NULL;

         int k;
         pid_t pid;
 
         int k;
         pid_t pid;
 


@@ -64,22 +109,23 @@ static int found_override(const char *top, const char *bottom) {
         assert(bottom);
 
         if (null_or_empty_path(top) > 0) {
         assert(bottom);
 
         if (null_or_empty_path(top) > 0) {

-                printf(ANSI_HIGHLIGHT_RED_ON "[MASK]" ANSI_HIGHLIGHT_OFF "       %s → %s\n", top, bottom);
-                goto finish;
+                notify_override_masked(top, bottom);
+                return 0;

         }
 
         k = readlink_malloc(top, &dest);
         if (k >= 0) {
                 if (equivalent(dest, bottom) > 0)
         }
 
         k = readlink_malloc(top, &dest);
         if (k >= 0) {
                 if (equivalent(dest, bottom) > 0)

-                        printf(ANSI_HIGHLIGHT_GREEN_ON "[EQUIVALENT]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
+                        notify_override_equivalent(top, bottom);

                 else
                 else

-                        printf(ANSI_HIGHLIGHT_ON "[REDIRECT]" ANSI_HIGHLIGHT_OFF "   %s → %s\n", top, bottom);
+                        notify_override_redirected(top, bottom);

 
 

-                free(dest);
-                goto finish;
+                return 0;

         }
 
         }
 

-        printf(ANSI_HIGHLIGHT_ON "[OVERRIDE]" ANSI_HIGHLIGHT_OFF "   %s → %s\n", top, bottom);
+        notify_override_overridden(top, bottom);
+        if (!arg_diff)
+                return 0;

 
         putchar('\n');
 
 
         putchar('\n');
 


@@ -99,14 +145,11 @@ static int found_override(const char *top, const char *bottom) {
 
         putchar('\n');
 
 
         putchar('\n');
 

-finish:
-

         return 0;
 }
 
 static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
         return 0;
 }
 
 static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {

-        DIR *d;
-        int r = 0;
+        _cleanup_closedir_ DIR *d;

 
         assert(top);
         assert(bottom);
 
         assert(top);
         assert(bottom);


@@ -122,15 +165,14 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
         }
 
         for (;;) {
         }
 
         for (;;) {

-                struct dirent *de, buf;
+                struct dirent *de;
+                union dirent_storage buf;

                 int k;
                 char *p;
 
                 int k;
                 char *p;
 

-                k = readdir_r(d, &buf, &de);
-                if (k != 0) {
-                        r = -k;
-                        goto finish;
-                }
+                k = readdir_r(d, &buf.de, &de);
+                if (k != 0)
+                        return -k;

 
                 if (!de)
                         break;
 
                 if (!de)
                         break;


@@ -138,46 +180,37 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
                 if (!dirent_is_file(de))
                         continue;
 
                 if (!dirent_is_file(de))
                         continue;
 

-                p = join(path, "/", de->d_name, NULL);
-                if (!p) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
+                p = strjoin(path, "/", de->d_name, NULL);
+                if (!p)
+                        return -ENOMEM;

 
                 path_kill_slashes(p);
 
                 k = hashmap_put(top, path_get_file_name(p), p);
                 if (k >= 0) {
                         p = strdup(p);
 
                 path_kill_slashes(p);
 
                 k = hashmap_put(top, path_get_file_name(p), p);
                 if (k >= 0) {
                         p = strdup(p);

-                        if (!p) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!p)
+                                return -ENOMEM;

                 } else if (k != -EEXIST) {
                         free(p);
                 } else if (k != -EEXIST) {
                         free(p);

-                        r = k;
-                        goto finish;
+                        return k;

                 }
 
                 free(hashmap_remove(bottom, path_get_file_name(p)));
                 k = hashmap_put(bottom, path_get_file_name(p), p);
                 if (k < 0) {
                         free(p);
                 }
 
                 free(hashmap_remove(bottom, path_get_file_name(p)));
                 k = hashmap_put(bottom, path_get_file_name(p), p);
                 if (k < 0) {
                         free(p);

-                        r = k;
-                        goto finish;
+                        return k;

                 }
         }
 
                 }
         }
 

-finish:
-        closedir(d);
-
-        return r;
+        return 0;

 }
 
 static int process_suffix(const char *prefixes, const char *suffix) {
         const char *p;
         char *f;
 }
 
 static int process_suffix(const char *prefixes, const char *suffix) {
         const char *p;
         char *f;

-        Hashmap *top, *bottom;
+        Hashmap *top, *bottom=NULL;

         int r = 0, k;
         Iterator i;
         int n_found = 0;
         int r = 0, k;
         Iterator i;
         int n_found = 0;


@@ -198,9 +231,9 @@ static int process_suffix(const char *prefixes, const char *suffix) {
         }
 
         NULSTR_FOREACH(p, prefixes) {
         }
 
         NULSTR_FOREACH(p, prefixes) {

-                char *t;
+                _cleanup_free_ char *t = NULL;

 
 

-                t = join(p, "/", suffix, NULL);
+                t = strjoin(p, "/", suffix, NULL);

                 if (!t) {
                         r = -ENOMEM;
                         goto finish;
                 if (!t) {
                         r = -ENOMEM;
                         goto finish;


@@ -211,7 +244,6 @@ static int process_suffix(const char *prefixes, const char *suffix) {
                         r = k;
 
                 log_debug("Looking at %s", t);
                         r = k;
 
                 log_debug("Looking at %s", t);

-                free(t);

         }
 
         HASHMAP_FOREACH(f, top, i) {
         }
 
         HASHMAP_FOREACH(f, top, i) {


@@ -220,8 +252,10 @@ static int process_suffix(const char *prefixes, const char *suffix) {
                 o = hashmap_get(bottom, path_get_file_name(f));
                 assert(o);
 
                 o = hashmap_get(bottom, path_get_file_name(f));
                 assert(o);
 

-                if (path_equal(o, f))
+                if (path_equal(o, f)) {
+                        notify_override_unchanged(f);

                         continue;
                         continue;

+                }

 
                 k = found_override(f, o);
                 if (k < 0)
 
                 k = found_override(f, o);
                 if (k < 0)


@@ -251,7 +285,7 @@ static int process_suffix_chop(const char *prefixes, const char *suffix) {
         /* Strip prefix from the suffix */
         NULSTR_FOREACH(p, prefixes) {
                 if (startswith(suffix, p)) {
         /* Strip prefix from the suffix */
         NULSTR_FOREACH(p, prefixes) {
                 if (startswith(suffix, p)) {

-                        suffix += strlen(p);;
+                        suffix += strlen(p);

                         suffix += strspn(suffix, "/");
                         return process_suffix(prefixes, suffix);
                 }
                         suffix += strspn(suffix, "/");
                         return process_suffix(prefixes, suffix);
                 }


@@ -267,14 +301,40 @@ static void help(void) {
                "Find overridden configuration files.\n\n"
                "  -h --help           Show this help\n"
                "     --version        Show package version\n"
                "Find overridden configuration files.\n\n"
                "  -h --help           Show this help\n"
                "     --version        Show package version\n"

-               "     --no-pager       Do not pipe output into a pager\n",
+               "     --no-pager       Do not pipe output into a pager\n"
+               "     --diff[=1|0]     Show a diff when overridden files differ\n"
+               "  -t --type=LIST...   Only display a selected set of override types\n",

                program_invocation_short_name);
 }
 
                program_invocation_short_name);
 }
 

+static int parse_flags(const char *flag_str, int flags) {
+        char *w, *state;
+        size_t l;
+
+        FOREACH_WORD(w, l, flag_str, state) {
+                if (strncmp("masked", w, l) == 0)
+                        flags |= SHOW_MASKED;
+                else if (strncmp ("equivalent", w, l) == 0)
+                        flags |= SHOW_EQUIVALENT;
+                else if (strncmp("redirected", w, l) == 0)
+                        flags |= SHOW_REDIRECTED;
+                else if (strncmp("overridden", w, l) == 0)
+                        flags |= SHOW_OVERRIDDEN;
+                else if (strncmp("unchanged", w, l) == 0)
+                        flags |= SHOW_UNCHANGED;
+                else if (strncmp("default", w, l) == 0)
+                        flags |= SHOW_DEFAULTS;
+                else
+                        return -EINVAL;
+        }
+        return flags;
+}
+

 static int parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_NO_PAGER = 0x100,
 static int parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_NO_PAGER = 0x100,

+                ARG_DIFF,

                 ARG_VERSION
         };
 
                 ARG_VERSION
         };
 


@@ -282,6 +342,8 @@ static int parse_argv(int argc, char *argv[]) {
                 { "help",      no_argument,       NULL, 'h'          },
                 { "version",   no_argument,       NULL, ARG_VERSION  },
                 { "no-pager",  no_argument,       NULL, ARG_NO_PAGER },
                 { "help",      no_argument,       NULL, 'h'          },
                 { "version",   no_argument,       NULL, ARG_VERSION  },
                 { "no-pager",  no_argument,       NULL, ARG_NO_PAGER },

+                { "diff",      optional_argument, NULL, ARG_DIFF     },
+                { "type",      required_argument, NULL, 't'          },

                 { NULL,        0,                 NULL, 0            }
         };
 
                 { NULL,        0,                 NULL, 0            }
         };
 


@@ -311,6 +373,34 @@ static int parse_argv(int argc, char *argv[]) {
                 case '?':
                         return -EINVAL;
 
                 case '?':
                         return -EINVAL;
 

+                case 't': {
+                        int f;
+                        f = parse_flags(optarg, arg_flags);
+                        if (f < 0) {
+                                log_error("Failed to parse flags field.");
+                                return -EINVAL;
+                        }
+                        arg_flags = f;
+                        break;
+                }
+
+                case ARG_DIFF:
+                        if (!optarg)
+                                arg_diff = 1;
+                        else {
+                                int b;
+
+                                b = parse_boolean(optarg);
+                                if (b < 0) {
+                                        log_error("Failed to parse diff boolean.");
+                                        return -EINVAL;
+                                } else if (b)
+                                        arg_diff = 1;
+                                else
+                                        arg_diff = 0;
+                        }
+                        break;
+

                 default:
                         log_error("Unknown option code %c", c);
                         return -EINVAL;
                 default:
                         log_error("Unknown option code %c", c);
                         return -EINVAL;


@@ -338,9 +428,11 @@ int main(int argc, char *argv[]) {
                 "sysctl.d\0"
                 "tmpfiles.d\0"
                 "modules-load.d\0"
                 "sysctl.d\0"
                 "tmpfiles.d\0"
                 "modules-load.d\0"

+                "binfmt.d\0"

                 "systemd/system\0"
                 "systemd/user\0"
                 "systemd/system\0"
                 "systemd/user\0"

-                "binfmt.d\0"
+                "systemd/system-preset\0"
+                "systemd/user-preset\0"

                 "udev/rules.d\0"
                 "modprobe.d\0";
 
                 "udev/rules.d\0"
                 "modprobe.d\0";
 


@@ -354,6 +446,14 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 goto finish;
 
         if (r <= 0)
                 goto finish;
 

+        if (arg_flags == 0)
+                arg_flags = SHOW_DEFAULTS;
+
+        if (arg_diff < 0)
+                arg_diff = !!(arg_flags & SHOW_OVERRIDDEN);
+        else if (arg_diff)
+                arg_flags |= SHOW_OVERRIDDEN;
+

         if (!arg_no_pager)
                 pager_open();
 
         if (!arg_no_pager)
                 pager_open();
 


@@ -381,7 +481,7 @@ int main(int argc, char *argv[]) {
         }
 
         if (r >= 0)
         }
 
         if (r >= 0)

-                printf("\n%i overriden configuration files found.\n", n_found);
+                printf("\n%i overridden configuration files found.\n", n_found);

 
 finish:
         pager_close();
 
 finish:
         pager_close();