[PATCH] fix log option code so that it actually works for all udev programs.

Also introduce boolean type for config file to use.

diff --git a/logging.h b/logging.h
index 5ae228b139fa778379ac0e03011b44adfd1bd60c..df0d7dedcea1ceb1b72ccd9a74341de84815913e 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -34,9 +34,6 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#include "udev.h"
-#include "udev_version.h"
-
 #undef info
 #define info(format, arg...)                                                           \
        do {                                                                            \
@@ -60,13 +57,17 @@
        } while (0)
 #endif
 
+/* each program must declare this variable and function somewhere */
+extern unsigned char logname[42];
+extern int log_ok(void);
+
 static void log_message (int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 static inline void log_message (int level, const char *format, ...)
 {
        va_list args;
 
-       if (0 != strncmp(udev_log_str, UDEV_LOG_DEFAULT, BOOL_SIZE))
+       if (!log_ok())
                return;
 
        va_start(args, format);
@@ -74,9 +75,6 @@ static inline void log_message (int level, const char *format, ...)
        va_end(args);
 }
 
-/* each program must declare this variable somewhere */
-extern unsigned char logname[42];
-
 #undef init_logging
 static inline void init_logging(char *program_name)
 {

diff --git a/test/ignore_test b/test/ignore_test
index 602624c1e022716adbb734e8c74105177486d48b..ca51e9a1abaa328b12a05e9f42f2d70b83cbade2 100644 (file)
--- a/test/ignore_test
+++ b/test/ignore_test
@@ -16,6 +16,7 @@ udev_root="$PWD/udev/"
 udev_db="$PWD/udev/.udev.tdb"
 udev_rules="$PWD/$RULES"
 udev_permissions="$PWD/udev.permissions"
+udev_log="true"
 EOF
 
 mkdir udev

diff --git a/udev.c b/udev.c
index b45fb336be8c631023b891a7a60b3840433a6f07..55a324efbc9a87d84340022a3a8b8b8fc01107c0 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -40,6 +40,11 @@ char **main_argv;
 char **main_envp;
 unsigned char logname[42];
 
+int log_ok(void)
+{
+       return udev_log;
+}
+
 static void sig_handler(int signum)
 {
        dbg("caught signal %d", signum);

diff --git a/udev.h b/udev.h
index 8b3f305d34effbe8d654a5094be98e00182a86ea..108623e0597eca6515689bc60c0ef1ce47e987ac 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -32,8 +32,6 @@
 #define OWNER_SIZE     30
 #define GROUP_SIZE     30
 #define MODE_SIZE      8
-#define BOOL_SIZE      5       /* 'yes', 'no' and possibly 'true' or 'false'
-                                  in future */
 
 struct udevice {
        char name[NAME_SIZE];
@@ -74,6 +72,6 @@ extern char udev_rules_filename[PATH_MAX+NAME_MAX];
 extern char default_mode_str[MODE_SIZE];
 extern char default_owner_str[OWNER_SIZE];
 extern char default_group_str[GROUP_SIZE];
-extern char udev_log_str[BOOL_SIZE];
+extern int udev_log;
 
 #endif

diff --git a/udev_config.c b/udev_config.c
index ec38272bc595aea3d84e1bbf4d9c03ba26c542d8..34ef82b8812c24220819c9ff9f85ab923fa0fa22 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -48,9 +48,18 @@ char udev_config_filename[PATH_MAX+NAME_MAX];
 char default_mode_str[MODE_SIZE];
 char default_owner_str[OWNER_SIZE];
 char default_group_str[GROUP_SIZE];
-char udev_log_str[BOOL_SIZE];
+int udev_log;
 
 
+static int string_is_true(char *str)
+{
+       if (strcasecmp(str, "true") == 0)
+               return 1;
+       if (strcasecmp(str, "yes") == 0)
+               return 1;
+       return 0;
+}
+
 static void init_variables(void)
 {
        /* fill up the defaults.  
@@ -61,7 +70,7 @@ static void init_variables(void)
        strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
        strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
        strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
-       strfieldcpy(udev_log_str, UDEV_LOG_DEFAULT);
+       udev_log = string_is_true(UDEV_LOG_DEFAULT);
 }
 
 #define set_var(_name, _var)                           \
@@ -70,6 +79,12 @@ static void init_variables(void)
                strncpy(_var, value, sizeof(_var));     \
        }
 
+#define set_bool(_name, _var)                          \
+       if (strcasecmp(variable, _name) == 0) {         \
+               dbg_parse("%s = '%s'", _name, value);   \
+               _var = string_is_true(value);           \
+       }
+
 int parse_get_pair(char **orig_string, char **left, char **right)
 {
        char *temp;
@@ -158,7 +173,7 @@ static int parse_config_file(void)
                set_var("default_mode", default_mode_str);
                set_var("default_owner", default_owner_str);
                set_var("default_group", default_group_str);
-               set_var("udev_log", udev_log_str);
+               set_bool("udev_log", udev_log);
        }
        dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
                  lineno, temp - line, temp);
@@ -194,7 +209,7 @@ static void get_dirs(void)
        dbg_parse("udev_db_filename = %s", udev_db_filename);
        dbg_parse("udev_rules_filename = %s", udev_rules_filename);
        dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
-       dbg_parse("udev_log_str = %s", udev_log_str);
+       dbg_parse("udev_log = %d", udev_log);
        parse_config_file();
 
        dbg_parse("udev_root = %s", udev_root);
@@ -202,7 +217,7 @@ static void get_dirs(void)
        dbg_parse("udev_db_filename = %s", udev_db_filename);
        dbg_parse("udev_rules_filename = %s", udev_rules_filename);
        dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
-       dbg_parse("udev_log_str = %s", udev_log_str);
+       dbg_parse("udev_log_str = %d", udev_log);
 }
 
 void udev_init_config(void)

diff --git a/udevd.c b/udevd.c
index 8ba833186e100bb3958acb0d0c6b2ff6e81beae1..476cb64309a2ab9f71caf3ed4f29fb8e23f49516 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -40,7 +40,6 @@
 #include "udevd.h"
 #include "logging.h"
 
-unsigned char logname[42];
 static int expected_seqnum = 0;
 volatile static int children_waiting;
 volatile static int msg_q_timeout;
@@ -52,6 +51,13 @@ LIST_HEAD(running_list);
 static void exec_queue_manager(void);
 static void msg_queue_manager(void);
 
+unsigned char logname[42];
+
+int log_ok(void)
+{
+       return 1;
+}
+
 static void msg_dump_queue(void)
 {
        struct hotplug_msg *msg;

diff --git a/udevinfo.c b/udevinfo.c
index 71a9a6d93e491c7a62d9cbcb74ff5550d7e02e45..103ebce08cad295a2d7443237e37e545031705cf 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -40,6 +40,11 @@ char **main_argv;
 int main_argc;
 unsigned char logname[42];
 
+int log_ok(void)
+{
+       return 1;
+}
+
 static int print_all_attributes(const char *path)
 {
        struct dlist *attributes;

diff --git a/udevsend.c b/udevsend.c
index f6de88565f073ee57a9d486bdb2ebd19fe390f65..17372d8d9a0ec28568f036ea82be120c93203166 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -42,6 +42,11 @@
 
 unsigned char logname[42];
 
+int log_ok(void)
+{
+       return 1;
+}
+
 static inline char *get_action(void)
 {
        char *action;