chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix SetUnitProperties
[elogind.git]
/
src
/
shared
/
path-lookup.c
diff --git
a/src/shared/path-lookup.c
b/src/shared/path-lookup.c
index fa4995ceea835d2632534980f509e3242c9ae491..1a47ea9ce75d88e85ef602d450ad3cbee622f995 100644
(file)
--- 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;
int user_config_home(char **config_home) {
const char *e;
+ char *r;
e = getenv("XDG_CONFIG_HOME");
if (e) {
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;
return -ENOMEM;
+ *config_home = r;
return 1;
} else {
const char *home;
home = getenv("HOME");
if (home) {
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;
return -ENOMEM;
+ *config_home = r;
return 1;
}
}
return 1;
}
}
@@
-317,12
+322,12
@@
int lookup_paths_init(
strv_uniq(p->unit_path);
if (!strv_isempty(p->unit_path)) {
strv_uniq(p->unit_path);
if (!strv_isempty(p->unit_path)) {
-
char _cleanup_free_
*t = strv_join(p->unit_path, "\n\t");
+
_cleanup_free_ char
*t = strv_join(p->unit_path, "\n\t");
if (!t)
return -ENOMEM;
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 {
} else {
- log_
info
("Ignoring unit files.");
+ log_
debug
("Ignoring unit files.");
strv_free(p->unit_path);
p->unit_path = NULL;
}
strv_free(p->unit_path);
p->unit_path = NULL;
}
@@
-377,18
+382,18
@@
int lookup_paths_init(
strv_uniq(p->sysvrcnd_path);
if (!strv_isempty(p->sysvinit_path)) {
strv_uniq(p->sysvrcnd_path);
if (!strv_isempty(p->sysvinit_path)) {
-
char _cleanup_free_
*t = strv_join(p->sysvinit_path, "\n\t");
+
_cleanup_free_ char
*t = strv_join(p->sysvinit_path, "\n\t");
if (!t)
return -ENOMEM;
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 {
} else {
- log_
info
("Ignoring SysV init scripts.");
+ log_
debug
("Ignoring SysV init scripts.");
strv_free(p->sysvinit_path);
p->sysvinit_path = NULL;
}
if (!strv_isempty(p->sysvrcnd_path)) {
strv_free(p->sysvinit_path);
p->sysvinit_path = NULL;
}
if (!strv_isempty(p->sysvrcnd_path)) {
-
char _cleanup_free_
*t =
+
_cleanup_free_ char
*t =
strv_join(p->sysvrcnd_path, "\n\t");
if (!t)
return -ENOMEM;
strv_join(p->sysvrcnd_path, "\n\t");
if (!t)
return -ENOMEM;
@@
-400,7
+405,7
@@
int lookup_paths_init(
p->sysvrcnd_path = NULL;
}
#else
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
}
#endif
}