[PATCH] overall whitespace + debug text conditioning

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 8d650c2561ddaa1f5d11bfb8d0340d59b1761810..a562bc27bea63ceb570598f4e2bed65300e6108f 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -39,8 +39,8 @@ char **main_argv;
 char **main_envp;
 
 char sysfs_path[SYSFS_PATH_MAX];
-char *udev_config_dir;
-char *udev_root;
+char *udev_config_dir = UDEV_CONFIG_DIR;
+char *udev_root = UDEV_ROOT;
 char udev_db_filename[PATH_MAX+NAME_MAX];
 char udev_config_permission_filename[PATH_MAX+NAME_MAX];
 char udev_config_filename[PATH_MAX+NAME_MAX];
@@ -72,36 +72,49 @@ static inline char *get_seqnum(void)
 
 static void get_dirs(void)
 {
-       char *udev_test;
        char *temp;
+       char *udev_db = UDEV_DB;
+       char *udev_config = UDEV_CONFIG_FILE;
+       char *udev_permission = UDEV_CONFIG_PERMISSION_FILE;
        int retval;
 
-       udev_test = getenv("UDEV_TEST");
-       if (udev_test == NULL) {
-               /* normal operation, use the compiled in defaults */
-               udev_config_dir = UDEV_CONFIG_DIR;
-               udev_root = UDEV_ROOT;
-               retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-               dbg("sysfs_path = %s", sysfs_path);
-               if (retval)
-                       dbg("sysfs_get_mnt_path failed");
-
-       } else {
-               /* hm testing is happening, use the specified values */
-               temp = getenv("UDEV_SYSFS_PATH");
-               strncpy(sysfs_path, temp, sizeof(sysfs_path));
-               udev_config_dir = getenv("UDEV_CONFIG_DIR");
-               udev_root = getenv("UDEV_ROOT");
+       retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+       if (retval)
+               dbg("sysfs_get_mnt_path failed");
+
+       /* see if we should try to override any of the default values */
+       temp = getenv("UDEV_TEST");
+       if (temp != NULL) {
+               /* hm testing is happening, use the specified values, if they are present */
+               temp = getenv("SYSFS_PATH");
+               if (temp)
+                       strncpy(sysfs_path, temp, sizeof(sysfs_path));
+               temp = getenv("UDEV_CONFIG_DIR");
+               if (temp)
+                       udev_config_dir = temp;
+               temp = getenv("UDEV_ROOT");
+               if (temp)
+                       udev_root = temp;
+               temp = getenv("UDEV_DB");
+               if (temp)
+                       udev_db = temp;
+               temp = getenv("UDEV_CONFIG_FILE");
+               if (temp)
+                       udev_config = temp;
+               temp = getenv("UDEV_PERMISSION_FILE");
+               if (temp)
+                       udev_permission = temp;
        }
+       dbg("sysfs_path='%s'", sysfs_path);
 
        strncpy(udev_db_filename, udev_config_dir, sizeof(udev_db_filename));
-       strncat(udev_db_filename, UDEV_DB, sizeof(udev_db_filename));
+       strncat(udev_db_filename, udev_db, sizeof(udev_db_filename));
 
        strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename));
-       strncat(udev_config_filename, NAMEDEV_CONFIG_FILE, sizeof(udev_config_filename));
+       strncat(udev_config_filename, udev_config, sizeof(udev_config_filename));
        
        strncpy(udev_config_permission_filename, udev_config_dir, sizeof(udev_config_permission_filename));
-       strncat(udev_config_permission_filename, NAMEDEV_CONFIG_PERMISSION_FILE, sizeof(udev_config_permission_filename));
+       strncat(udev_config_permission_filename, udev_permission, sizeof(udev_config_permission_filename));
 }
 
 int main(int argc, char **argv, char **envp)
@@ -128,12 +141,12 @@ int main(int argc, char **argv, char **envp)
                dbg ("no devpath?");
                goto exit;
        }
-       dbg("looking at %s", devpath);
+       dbg("looking at '%s'", devpath);
 
        /* we only care about class devices and block stuff */
        if (!strstr(devpath, "class") &&
            !strstr(devpath, "block")) {
-               dbg("not block or class");
+               dbg("not a block or class device");
                goto exit;
        }
 
@@ -153,7 +166,7 @@ int main(int argc, char **argv, char **envp)
        get_dirs();
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
-               dbg("Unable to initialize database.");
+               dbg("unable to initialize database");
                goto exit;
        }
 
@@ -167,7 +180,7 @@ int main(int argc, char **argv, char **envp)
                retval = udev_remove_device(devpath, subsystem);
 
        else {
-               dbg("Unknown action: %s", action);
+               dbg("unknown action '%s'", action);
                retval = -EINVAL;
        }
        udevdb_exit();
@@ -175,4 +188,3 @@ int main(int argc, char **argv, char **envp)
 exit:  
        return retval;
 }
-