X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsysv-generator%2Fsysv-generator.c;h=432846990913748444004eea735dfec193784e12;hp=9a869badcade5f65fa967e48860c07962d75acc3;hb=aad0a2c80097926757d4385e5f5492082d47f006;hpb=805b573fad06b845502e76f3db3a0efa7583149d diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 9a869badc..432846990 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -31,7 +31,6 @@ #include "path-util.h" #include "path-lookup.h" #include "log.h" -#include "strv.h" #include "unit.h" #include "unit-name.h" #include "special.h" @@ -114,9 +113,9 @@ static int add_symlink(const char *service, const char *where) { } static int generate_unit_file(SysvStub *s) { - char *unit; char **p; _cleanup_fclose_ FILE *f = NULL; + _cleanup_free_ char *unit = NULL; _cleanup_free_ char *before = NULL; _cleanup_free_ char *after = NULL; _cleanup_free_ char *wants = NULL; @@ -152,6 +151,7 @@ static int generate_unit_file(SysvStub *s) { fprintf(f, "# Automatically generated by systemd-sysv-generator\n\n" "[Unit]\n" + "Documentation=man:systemd-sysv-generator(8)\n" "SourcePath=%s\n" "Description=%s\n", s->path, s->description); @@ -193,7 +193,7 @@ static int generate_unit_file(SysvStub *s) { STRV_FOREACH(p, s->wanted_by) { r = add_symlink(s->name, *p); if (r < 0) - log_error_unit(s->name, "Failed to create 'Wants' symlink to %s: %s", *p, strerror(-r)); + log_unit_error(s->name, "Failed to create 'Wants' symlink to %s: %s", *p, strerror(-r)); } return 0; @@ -321,7 +321,7 @@ static int load_sysv(SysvStub *s) { if (feof(f)) break; - log_error_unit(s->name, + log_unit_error(s->name, "Failed to read configuration file '%s': %m", s->path); return -errno; @@ -396,7 +396,7 @@ static int load_sysv(SysvStub *s) { fn = strstrip(t+8); if (!path_is_absolute(fn)) { - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] PID file not absolute. Ignoring.", s->path, line); continue; @@ -442,15 +442,15 @@ static int load_sysv(SysvStub *s) { } else if (state == LSB || state == LSB_DESCRIPTION) { if (startswith_no_case(t, "Provides:")) { - char *i, *w; + const char *word, *state_; size_t z; state = LSB; - FOREACH_WORD_QUOTED(w, z, t+9, i) { + FOREACH_WORD_QUOTED(word, z, t+9, state_) { _cleanup_free_ char *n = NULL, *m = NULL; - n = strndup(w, z); + n = strndup(word, z); if (!n) return -ENOMEM; @@ -490,31 +490,35 @@ static int load_sysv(SysvStub *s) { } if (r < 0) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to add LSB Provides name %s, ignoring: %s", s->path, line, m, strerror(-r)); } + if (!isempty(state_)) + log_unit_error(s->name, + "[%s:%u] Trailing garbage in Provides, ignoring.", + s->path, line); } else if (startswith_no_case(t, "Required-Start:") || startswith_no_case(t, "Should-Start:") || startswith_no_case(t, "X-Start-Before:") || startswith_no_case(t, "X-Start-After:")) { - char *i, *w; + const char *word, *state_; size_t z; state = LSB; - FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) { + FOREACH_WORD_QUOTED(word, z, strchr(t, ':')+1, state_) { _cleanup_free_ char *n = NULL, *m = NULL; bool is_before; - n = strndup(w, z); + n = strndup(word, z); if (!n) return -ENOMEM; r = sysv_translate_facility(n, basename(s->path), &m); if (r < 0) { - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s", s->path, line, n, strerror(-r)); continue; @@ -548,10 +552,15 @@ static int load_sysv(SysvStub *s) { } if (r < 0) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to add dependency on %s, ignoring: %s", s->path, line, m, strerror(-r)); } + if (!isempty(state_)) + log_unit_error(s->name, + "[%s:%u] Trailing garbage in %*s, ignoring.", + s->path, line, + (int)(strchr(t, ':') - t), t); } else if (startswith_no_case(t, "Description:")) { char *d, *j; @@ -801,9 +810,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { goto finish; } - if (hashmap_contains(all_services, name)) - service = hashmap_get(all_services, name); - else { + service = hashmap_get(all_services, name); + if (!service){ log_warning("Could not find init script for %s", name); continue; } @@ -815,8 +823,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { MAX(a*10 + b, service->sysv_start_priority); } - r = set_ensure_allocated(&runlevel_services[i], - trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&runlevel_services[i], NULL); if (r < 0) goto finish; @@ -827,8 +834,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { } else if (de->d_name[0] == 'K' && (rcnd_table[i].type == RUNLEVEL_DOWN)) { - r = set_ensure_allocated(&shutdown_services, - trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&shutdown_services, NULL); if (r < 0) goto finish; @@ -896,7 +902,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - all_services = hashmap_new(string_hash_func, string_compare_func); + all_services = hashmap_new(&string_hash_ops); if (!all_services) { log_oom(); return EXIT_FAILURE;