X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=803d2a7fc798bdc69b86b26e81b7a8b1959ec329;hb=599659860c770058f2eb04d578c521c16e0b1853;hp=25c1f960fd8eda56137af9e5425c123081b6dd92;hpb=c0ef53aa5b54e2b1d4abe316ebb12d3e1d0d9250;p=elogind.git

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 25c1f960f..803d2a7fc 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -39,11 +39,11 @@ static enum {
         SHOW_MASKED = 1 << 0,
         SHOW_EQUIVALENT = 1 << 1,
         SHOW_REDIRECTED = 1 << 2,
-        SHOW_OVERRIDEN = 1 << 3,
+        SHOW_OVERRIDDEN = 1 << 3,
         SHOW_UNCHANGED = 1 << 4,
 
         SHOW_DEFAULTS =
-        (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDEN)
+        (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN)
 } arg_flags = 0;
 
 static int equivalent(const char *a, const char *b) {
@@ -91,11 +91,11 @@ static int notify_override_redirected(const char *top, const char *bottom) {
         return 1;
 }
 
-static int notify_override_overriden(const char *top, const char *bottom) {
-        if (!(arg_flags & SHOW_OVERRIDEN))
+static int notify_override_overridden(const char *top, const char *bottom) {
+        if (!(arg_flags & SHOW_OVERRIDDEN))
                 return 0;
 
-        printf(ANSI_HIGHLIGHT_ON "[OVERRIDEN]" ANSI_HIGHLIGHT_OFF "  %s → %s\n", top, bottom);
+        printf(ANSI_HIGHLIGHT_ON "[OVERRIDDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
         return 1;
 }
 
@@ -131,7 +131,7 @@ static int found_override(const char *top, const char *bottom) {
                 goto finish;
         }
 
-        notify_override_overriden(top, bottom);
+        notify_override_overridden(top, bottom);
         if (!arg_diff)
                 goto finish;
 
@@ -176,11 +176,12 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
         }
 
         for (;;) {
-                struct dirent *de, buf;
+                struct dirent *de;
+                union dirent_storage buf;
                 int k;
                 char *p;
 
-                k = readdir_r(d, &buf, &de);
+                k = readdir_r(d, &buf.de, &de);
                 if (k != 0) {
                         r = -k;
                         goto finish;
@@ -192,7 +193,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
                 if (!dirent_is_file(de))
                         continue;
 
-                p = join(path, "/", de->d_name, NULL);
+                p = strjoin(path, "/", de->d_name, NULL);
                 if (!p) {
                         r = -ENOMEM;
                         goto finish;
@@ -231,7 +232,7 @@ finish:
 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;
@@ -254,7 +255,7 @@ static int process_suffix(const char *prefixes, const char *suffix) {
         NULSTR_FOREACH(p, prefixes) {
                 char *t;
 
-                t = join(p, "/", suffix, NULL);
+                t = strjoin(p, "/", suffix, NULL);
                 if (!t) {
                         r = -ENOMEM;
                         goto finish;
@@ -324,7 +325,7 @@ static void help(void) {
                "  -h --help           Show this help\n"
                "     --version        Show package version\n"
                "     --no-pager       Do not pipe output into a pager\n"
-               "     --diff[=1|0]     Show a diff when overriden files differ\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);
 }
@@ -340,8 +341,8 @@ static int parse_flags(const char *flag_str, int flags) {
                         flags |= SHOW_EQUIVALENT;
                 else if (strncmp("redirected", w, l) == 0)
                         flags |= SHOW_REDIRECTED;
-                else if (strncmp("overriden", w, l) == 0)
-                        flags |= SHOW_OVERRIDEN;
+                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)
@@ -453,8 +454,8 @@ int main(int argc, char *argv[]) {
                 "binfmt.d\0"
                 "systemd/system\0"
                 "systemd/user\0"
-                "systemd/system.preset\0"
-                "systemd/user.preset\0"
+                "systemd/system-preset\0"
+                "systemd/user-preset\0"
                 "udev/rules.d\0"
                 "modprobe.d\0";
 
@@ -472,9 +473,9 @@ int main(int argc, char *argv[]) {
                 arg_flags = SHOW_DEFAULTS;
 
         if (arg_diff < 0)
-                arg_diff = !!(arg_flags & SHOW_OVERRIDEN);
+                arg_diff = !!(arg_flags & SHOW_OVERRIDDEN);
         else if (arg_diff)
-                arg_flags |= SHOW_OVERRIDEN;
+                arg_flags |= SHOW_OVERRIDDEN;
 
         if (!arg_no_pager)
                 pager_open();
@@ -503,7 +504,7 @@ int main(int argc, char *argv[]) {
         }
 
         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();