X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.c;h=ffdc5367cb79bf6f416f6950eedc75ebaff31d62;hb=984a2be450abac81474889b8bea4b3fbeddb26c5;hp=8ee9ddc9c6e65662560481a28a927f6207e2eb98;hpb=874310b7b68c4c0d36ff07397db30a959bb7dae5;p=elogind.git

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 8ee9ddc9c..ffdc5367c 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -41,21 +41,26 @@ DEFINE_STRING_TABLE_LOOKUP(systemd_running_as, SystemdRunningAs);
 
 int user_config_home(char **config_home) {
         const char *e;
+        char *r;
 
         e = getenv("XDG_CONFIG_HOME");
         if (e) {
-                if (asprintf(config_home, "%s/systemd/user", e) < 0)
+                r = strappend(e, "/systemd/user");
+                if (!r)
                         return -ENOMEM;
 
+                *config_home = r;
                 return 1;
         } else {
                 const char *home;
 
                 home = getenv("HOME");
                 if (home) {
-                        if (asprintf(config_home, "%s/.config/systemd/user", home) < 0)
+                        r = strappend(home, "/.config/systemd/user");
+                        if (!r)
                                 return -ENOMEM;
 
+                        *config_home = r;
                         return 1;
                 }
         }
@@ -239,7 +244,6 @@ int lookup_paths_init(
                 const char *generator_late) {
 
         const char *e;
-        char *t;
 
         assert(p);
 
@@ -318,14 +322,12 @@ int lookup_paths_init(
         strv_uniq(p->unit_path);
 
         if (!strv_isempty(p->unit_path)) {
-
-                t = strv_join(p->unit_path, "\n\t");
+                char _cleanup_free_ *t = strv_join(p->unit_path, "\n\t");
                 if (!t)
                         return -ENOMEM;
-                log_debug("Looking for unit files in:\n\t%s", t);
-                free(t);
+                log_info("Looking for unit files in (higher priority first):\n\t%s", t);
         } else {
-                log_debug("Ignoring unit files.");
+                log_info("Ignoring unit files.");
                 strv_free(p->unit_path);
                 p->unit_path = NULL;
         }
@@ -380,33 +382,30 @@ int lookup_paths_init(
                 strv_uniq(p->sysvrcnd_path);
 
                 if (!strv_isempty(p->sysvinit_path)) {
-
-                        t = strv_join(p->sysvinit_path, "\n\t");
+                        char _cleanup_free_ *t = strv_join(p->sysvinit_path, "\n\t");
                         if (!t)
                                 return -ENOMEM;
-                        log_debug("Looking for SysV init scripts in:\n\t%s", t);
-                        free(t);
+                        log_info("Looking for SysV init scripts in:\n\t%s", t);
                 } else {
-                        log_debug("Ignoring SysV init scripts.");
+                        log_info("Ignoring SysV init scripts.");
                         strv_free(p->sysvinit_path);
                         p->sysvinit_path = NULL;
                 }
 
                 if (!strv_isempty(p->sysvrcnd_path)) {
-
-                        t = strv_join(p->sysvrcnd_path, "\n\t");
+                        char _cleanup_free_ *t =
+                                strv_join(p->sysvrcnd_path, "\n\t");
                         if (!t)
                                 return -ENOMEM;
 
                         log_debug("Looking for SysV rcN.d links in:\n\t%s", t);
-                        free(t);
                 } else {
                         log_debug("Ignoring SysV rcN.d links.");
                         strv_free(p->sysvrcnd_path);
                         p->sysvrcnd_path = NULL;
                 }
 #else
-                log_debug("Disabled SysV init scripts and rcN.d links support");
+                log_info("SysV init scripts and rcN.d links support disabled");
 #endif
         }