X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.c;h=6bb390fc9056b72255838934f4cdf8e181189424;hb=66e35261ef51119189486e9a31e7b97e8e18e255;hp=fa4995ceea835d2632534980f509e3242c9ae491;hpb=7ad94c716d6403233d04c4d37cb14df958c9b65d;p=elogind.git diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index fa4995cee..6bb390fc9 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; } } @@ -320,9 +325,9 @@ int lookup_paths_init( char _cleanup_free_ *t = strv_join(p->unit_path, "\n\t"); if (!t) return -ENOMEM; - log_info("Looking for unit files in (higher priority first):\n\t%s", t); + log_debug("Looking for unit files in (higher priority first):\n\t%s", t); } else { - log_info("Ignoring unit files."); + log_debug("Ignoring unit files."); strv_free(p->unit_path); p->unit_path = NULL; } @@ -380,9 +385,9 @@ int lookup_paths_init( char _cleanup_free_ *t = strv_join(p->sysvinit_path, "\n\t"); if (!t) return -ENOMEM; - log_info("Looking for SysV init scripts in:\n\t%s", t); + log_debug("Looking for SysV init scripts in:\n\t%s", t); } else { - log_info("Ignoring SysV init scripts."); + log_debug("Ignoring SysV init scripts."); strv_free(p->sysvinit_path); p->sysvinit_path = NULL; } @@ -400,7 +405,7 @@ int lookup_paths_init( p->sysvrcnd_path = NULL; } #else - log_info("SysV init scripts and rcN.d links support disabled"); + log_debug("SysV init scripts and rcN.d links support disabled"); #endif }