chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getty: fix message
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index 5c17413a5906351978b705e155e0a0c508affbbc..4e3b6e719c5c6eac33d320a0f15d26ac5ba94ae8 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-635,7
+635,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
char *d = NULL;
if (chkconfig_description)
char *d = NULL;
if (chkconfig_description)
-
asprintf(&d, "%s %s", chkconfig_description, j
);
+
d = join(chkconfig_description, " ", j, NULL
);
else
d = strdup(j);
else
d = strdup(j);
@@
-805,7
+805,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
char *d = NULL;
if (long_description)
char *d = NULL;
if (long_description)
-
asprintf(&d, "%s %s", long_description, t
);
+
d = join(long_description, " ", t, NULL
);
else
d = strdup(j);
else
d = strdup(j);
@@
-921,7
+921,8
@@
static int service_load_sysv_name(Service *s, const char *name) {
char *path;
int r;
char *path;
int r;
- if (asprintf(&path, "%s/%s", *p, name) < 0)
+ path = join(*p, "/", name, NULL);
+ if (!path)
return -ENOMEM;
assert(endswith(path, ".service"));
return -ENOMEM;
assert(endswith(path, ".service"));
@@
-942,7
+943,8
@@
static int service_load_sysv_name(Service *s, const char *name) {
if (r >= 0 && s->meta.load_state == UNIT_STUB) {
/* Try SUSE style boot.* init scripts */
if (r >= 0 && s->meta.load_state == UNIT_STUB) {
/* Try SUSE style boot.* init scripts */
- if (asprintf(&path, "%s/boot.%s", *p, name) < 0)
+ path = join(*p, "/boot.", name, NULL);
+ if (!path)
return -ENOMEM;
/* Drop .service suffix */
return -ENOMEM;
/* Drop .service suffix */
@@
-956,7
+958,8
@@
static int service_load_sysv_name(Service *s, const char *name) {
if (r >= 0 && s->meta.load_state == UNIT_STUB) {
/* Try Frugalware style rc.* init scripts */
if (r >= 0 && s->meta.load_state == UNIT_STUB) {
/* Try Frugalware style rc.* init scripts */
- if (asprintf(&path, "%s/rc.%s", *p, name) < 0)
+ path = join(*p, "/rc.", name, NULL);
+ if (!path)
return -ENOMEM;
/* Drop .service suffix */
return -ENOMEM;
/* Drop .service suffix */
@@
-2987,7
+2990,6
@@
static int service_enumerate(Manager *m) {
struct dirent *de;
free(path);
struct dirent *de;
free(path);
- path = NULL;
path = join(*p, "/", rcnd_table[i].path, NULL);
if (!path) {
r = -ENOMEM;
path = join(*p, "/", rcnd_table[i].path, NULL);
if (!path) {
r = -ENOMEM;
@@
-3023,8
+3025,8
@@
static int service_enumerate(Manager *m) {
continue;
free(fpath);
continue;
free(fpath);
- fpath =
NULL
;
- if (
asprintf(&fpath, "%s/%s/%s", *p, rcnd_table[i].path, de->d_name) < 0
) {
+ fpath =
join(path, "/", de->d_name, NULL)
;
+ if (
!path
) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}