X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=a9d75f3b7c9e9a3d34ecbace5d4b9c811bf4e7dd;hp=0d38bccd7220061ce8813faf3f03c1cb404f5b3a;hb=20f59e42cd64c0c7fd9386b0ca93842c6cdbc387;hpb=d5891fdacf761130c9babdb5e50367504d29970c

diff --git a/src/shared/install.c b/src/shared/install.c
index 0d38bccd7..a9d75f3b7 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -59,7 +59,7 @@ static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope)
         zero(*paths);
 
         return lookup_paths_init(paths,
-                                 scope == UNIT_FILE_SYSTEM ? MANAGER_SYSTEM : MANAGER_USER,
+                                 scope == UNIT_FILE_SYSTEM ? SYSTEMD_SYSTEM : SYSTEMD_USER,
                                  scope == UNIT_FILE_USER,
                                  NULL, NULL, NULL);
 }
@@ -201,7 +201,6 @@ static int remove_marked_symlinks_fd(
 
         int r = 0;
         DIR *d;
-        struct dirent buffer, *de;
 
         assert(remove_symlinks_to);
         assert(fd >= 0);
@@ -218,9 +217,11 @@ static int remove_marked_symlinks_fd(
         rewinddir(d);
 
         for (;;) {
+                struct dirent *de;
+                union dirent_storage buf;
                 int k;
 
-                k = readdir_r(d, &buffer, &de);
+                k = readdir_r(d, &buf.de, &de);
                 if (k != 0) {
                         r = -errno;
                         break;
@@ -375,7 +376,6 @@ static int find_symlinks_fd(
 
         int r = 0;
         DIR *d;
-        struct dirent buffer, *de;
 
         assert(name);
         assert(fd >= 0);
@@ -391,8 +391,10 @@ static int find_symlinks_fd(
 
         for (;;) {
                 int k;
+                struct dirent *de;
+                union dirent_storage buf;
 
-                k = readdir_r(d, &buffer, &de);
+                k = readdir_r(d, &buf.de, &de);
                 if (k != 0) {
                         r = -errno;
                         break;
@@ -541,7 +543,7 @@ static int find_symlinks_in_scope(
                 UnitFileState *state) {
 
         int r;
-        char *path;
+        char _cleanup_free_ *path = NULL;
         bool same_name_link_runtime = false, same_name_link = false;
 
         assert(scope >= 0);
@@ -556,8 +558,6 @@ static int find_symlinks_in_scope(
                         return r;
 
                 r = find_symlinks(name, path, &same_name_link_runtime);
-                free(path);
-
                 if (r < 0)
                         return r;
                 else if (r > 0) {
@@ -572,8 +572,6 @@ static int find_symlinks_in_scope(
                 return r;
 
         r = find_symlinks(name, path, &same_name_link);
-        free(path);
-
         if (r < 0)
                 return r;
         else if (r > 0) {
@@ -603,7 +601,8 @@ int unit_file_mask(
                 UnitFileChange **changes,
                 unsigned *n_changes) {
 
-        char **i, *prefix;
+        char **i;
+        char _cleanup_free_ *prefix;
         int r;
 
         assert(scope >= 0);
@@ -614,7 +613,7 @@ int unit_file_mask(
                 return r;
 
         STRV_FOREACH(i, files) {
-                char *path;
+                char _cleanup_free_ *path = NULL;
 
                 if (!unit_name_is_valid(*i, true)) {
                         if (r == 0)
@@ -631,16 +630,13 @@ int unit_file_mask(
                 if (symlink("/dev/null", path) >= 0) {
                         add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null");
 
-                        free(path);
                         continue;
                 }
 
                 if (errno == EEXIST) {
 
-                        if (null_or_empty_path(path) > 0) {
-                                free(path);
+                        if (null_or_empty_path(path) > 0)
                                 continue;
-                        }
 
                         if (force) {
                                 unlink(path);
@@ -650,7 +646,6 @@ int unit_file_mask(
                                         add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL);
                                         add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null");
 
-                                        free(path);
                                         continue;
                                 }
                         }
@@ -661,12 +656,8 @@ int unit_file_mask(
                         if (r == 0)
                                 r = -errno;
                 }
-
-                free(path);
         }
 
-        free(prefix);
-
         return r;
 }
 
@@ -1524,7 +1515,7 @@ int unit_file_enable(
 
         /* This will return the number of symlink rules that were
         supposed to be created, not the ones actually created. This is
-        useful to determine whether the passed files hat any
+        useful to determine whether the passed files had any
         installation data at all. */
         r = install_context_apply(&c, &paths, config_path, root_dir, force, changes, n_changes);
 
@@ -1917,7 +1908,6 @@ int unit_file_get_list(
                 return r;
 
         STRV_FOREACH(i, paths.unit_path) {
-                struct dirent buffer, *de;
                 const char *units_dir;
 
                 free(buf);
@@ -1945,9 +1935,11 @@ int unit_file_get_list(
                 }
 
                 for (;;) {
+                        struct dirent *de;
+                        union dirent_storage buffer;
                         UnitFileList *f;
 
-                        r = readdir_r(d, &buffer, &de);
+                        r = readdir_r(d, &buffer.de, &de);
                         if (r != 0) {
                                 r = -r;
                                 goto finish;