shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-08-27 21:50:15 +03:00
Code Activity

sysv-generator: minor simplifications

Browse Source
This commit is contained in:
Lennart Poettering
2015-01-27 23:11:01 +01:00
parent d44efb621a
commit 4e48855534
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sysv-generator/sysv-generator.c
View File

@ -274,10 +274,9 @@ static int sysv_translate_facility(const char *name, const char *filename, char
"time", SPECIAL_TIME_SYNC_TARGET, "time", SPECIAL_TIME_SYNC_TARGET,
}; };
unsigned i; char *filename_no_sh, *e, *r;
char *r;
const char *n; const char *n;
_cleanup_free_ char *filename_no_sh = NULL; unsigned i;
assert(name); assert(name);
assert(_r); assert(_r);
@ -300,11 +299,12 @@ static int sysv_translate_facility(const char *name, const char *filename, char
} }
/* strip ".sh" suffix from file name for comparison */ /* strip ".sh" suffix from file name for comparison */
filename_no_sh = strdup(filename); filename_no_sh = strdupa(filename);
if (!filename_no_sh) e = endswith(filename, ".sh");
return -ENOMEM; if (e) {
if (endswith(filename, ".sh")) *e = '\0';
filename_no_sh[strlen(filename)-3] = '\0'; filename = filename_no_sh;
}
/* If we don't know this name, fallback heuristics to figure /* If we don't know this name, fallback heuristics to figure
* out whether something is a target or a service alias. */ * out whether something is a target or a service alias. */
@ -315,7 +315,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
/* Facilities starting with $ are most likely targets */ /* Facilities starting with $ are most likely targets */
r = unit_name_build(n, NULL, ".target"); r = unit_name_build(n, NULL, ".target");
} else if (filename && streq(name, filename_no_sh)) } else if (filename && streq(name, filename))
/* Names equaling the file name of the services are redundant */ /* Names equaling the file name of the services are redundant */
return 0; return 0;
else else
@ -495,10 +495,8 @@ static int load_sysv(SysvStub *s) {
return -ENOMEM; return -ENOMEM;
r = sysv_translate_facility(n, basename(s->path), &m); r = sysv_translate_facility(n, basename(s->path), &m);
if (r < 0) if (r < 0)
return r; return r;
if (r == 0) if (r == 0)
continue; continue;