log: rearrange log function naming

[elogind.git] / src / sysv-generator / sysv-generator.c

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 0b8d8f73ddec2915f35f2702a95326faec507f19..a2f853380cc49796a3ebeaee88aeff432c9e5b7a 100644 (file)
--- 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 "path-util.h"
 #include "path-lookup.h"
 #include "log.h"

-#include "strv.h"

 #include "unit.h"
 #include "unit-name.h"
 #include "special.h"
 #include "unit.h"
 #include "unit-name.h"
 #include "special.h"


@@ -78,6 +77,7 @@ typedef struct SysvStub {
         char **before;
         char **after;
         char **wants;
         char **before;
         char **after;
         char **wants;

+        char **wanted_by;

         char **conflicts;
         bool has_lsb;
         bool reload;
         char **conflicts;
         bool has_lsb;
         bool reload;


@@ -113,11 +113,12 @@ static int add_symlink(const char *service, const char *where) {
 }
 
 static int generate_unit_file(SysvStub *s) {
 }
 
 static int generate_unit_file(SysvStub *s) {

-        char *unit;

         char **p;
         _cleanup_fclose_ FILE *f = NULL;
         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 *before = NULL;
         _cleanup_free_ char *after = NULL;

+        _cleanup_free_ char *wants = NULL;

         _cleanup_free_ char *conflicts = NULL;
         int r;
 
         _cleanup_free_ char *conflicts = NULL;
         int r;
 


@@ -129,6 +130,10 @@ static int generate_unit_file(SysvStub *s) {
         if (!after)
                 return log_oom();
 
         if (!after)
                 return log_oom();
 

+        wants = strv_join(s->wants, " ");
+        if (!wants)
+                return log_oom();
+

         conflicts = strv_join(s->conflicts, " ");
         if (!conflicts)
                 return log_oom();
         conflicts = strv_join(s->conflicts, " ");
         if (!conflicts)
                 return log_oom();


@@ -154,6 +159,8 @@ static int generate_unit_file(SysvStub *s) {
                 fprintf(f, "Before=%s\n", before);
         if (!isempty(after))
                 fprintf(f, "After=%s\n", after);
                 fprintf(f, "Before=%s\n", before);
         if (!isempty(after))
                 fprintf(f, "After=%s\n", after);

+        if (!isempty(wants))
+                fprintf(f, "Wants=%s\n", wants);

         if (!isempty(conflicts))
                 fprintf(f, "Conflicts=%s\n", conflicts);
 
         if (!isempty(conflicts))
                 fprintf(f, "Conflicts=%s\n", conflicts);
 


@@ -172,7 +179,7 @@ static int generate_unit_file(SysvStub *s) {
                 fprintf(f, "SysVStartPriority=%d\n", s->sysv_start_priority);
 
         if (s->pid_file)
                 fprintf(f, "SysVStartPriority=%d\n", s->sysv_start_priority);
 
         if (s->pid_file)

-                fprintf(f, "PidFile=%s\n", s->pid_file);
+                fprintf(f, "PIDFile=%s\n", s->pid_file);

 
         fprintf(f,
                 "ExecStart=%s start\n"
 
         fprintf(f,
                 "ExecStart=%s start\n"


@@ -182,10 +189,10 @@ static int generate_unit_file(SysvStub *s) {
         if (s->reload)
                 fprintf(f, "ExecReload=%s reload\n", s->path);
 
         if (s->reload)
                 fprintf(f, "ExecReload=%s reload\n", s->path);
 

-        STRV_FOREACH(p, s->wants) {
+        STRV_FOREACH(p, s->wanted_by) {

                 r = add_symlink(s->name, *p);
                 if (r < 0)
                 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;
         }
 
         return 0;


@@ -313,7 +320,7 @@ static int load_sysv(SysvStub *s) {
                         if (feof(f))
                                 break;
 
                         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;
                                        "Failed to read configuration file '%s': %m",
                                        s->path);
                         return -errno;


@@ -388,7 +395,7 @@ static int load_sysv(SysvStub *s) {
 
                                 fn = strstrip(t+8);
                                 if (!path_is_absolute(fn)) {
 
                                 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;
                                                        "[%s:%u] PID file not absolute. Ignoring.",
                                                        s->path, line);
                                         continue;


@@ -434,15 +441,15 @@ static int load_sysv(SysvStub *s) {
                 } else if (state == LSB || state == LSB_DESCRIPTION) {
 
                         if (startswith_no_case(t, "Provides:")) {
                 } 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;
 
                                 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;
 
                                         _cleanup_free_ char *n = NULL, *m = NULL;
 

-                                        n = strndup(w, z);
+                                        n = strndup(word, z);

                                         if (!n)
                                                 return -ENOMEM;
 
                                         if (!n)
                                                 return -ENOMEM;
 


@@ -474,34 +481,43 @@ static int load_sysv(SysvStub *s) {
                                                 r = strv_extend(&s->wants, m);
                                                 if (r < 0)
                                                         return log_oom();
                                                 r = strv_extend(&s->wants, m);
                                                 if (r < 0)
                                                         return log_oom();

+                                                if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET)) {
+                                                        r = strv_extend(&s->before, SPECIAL_NETWORK_TARGET);
+                                                        if (r < 0)
+                                                                return log_oom();
+                                                }

                                         }
 
                                         if (r < 0)
                                         }
 
                                         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));
                                 }
                                                                "[%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:")) {
 
                         } 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;
 
                                 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;
 
                                         _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) {
                                         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;
                                                                "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s",
                                                                s->path, line, n, strerror(-r));
                                                 continue;


@@ -535,10 +551,15 @@ static int load_sysv(SysvStub *s) {
                                         }
 
                                         if (r < 0)
                                         }
 
                                         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));
                                 }
                                                                "[%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;
 
                         } else if (startswith_no_case(t, "Description:")) {
                                 char *d, *j;


@@ -788,10 +809,9 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                                         goto finish;
                                 }
 
                                         goto finish;
                                 }
 

-                                if (hashmap_contains(all_services, name))
-                                        service = hashmap_get(all_services, name);
-                                else {
-                                        log_warning("Could not find init scirpt for %s", name);
+                                service = hashmap_get(all_services, name);
+                                if (!service){
+                                        log_warning("Could not find init script for %s", name);

                                         continue;
                                 }
 
                                         continue;
                                 }
 


@@ -802,8 +822,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                                                         MAX(a*10 + b, service->sysv_start_priority);
                                         }
 
                                                         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;
 
                                         if (r < 0)
                                                 goto finish;
 


@@ -814,8 +833,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)) {
 
                                 } 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;
 
                                         if (r < 0)
                                                 goto finish;
 


@@ -832,7 +850,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                         r = strv_extend(&service->before, rcnd_table[i].target);
                         if (r < 0)
                                 return log_oom();
                         r = strv_extend(&service->before, rcnd_table[i].target);
                         if (r < 0)
                                 return log_oom();

-                        r = strv_extend(&service->wants, rcnd_table[i].target);
+                        r = strv_extend(&service->wanted_by, rcnd_table[i].target);

                         if (r < 0)
                                 return log_oom();
                 }
                         if (r < 0)
                                 return log_oom();
                 }


@@ -883,7 +901,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
                 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;
         if (!all_services) {
                 log_oom();
                 return EXIT_FAILURE;