udevadm: info - use "udev_device"

[elogind.git] / udev / lib / libudev.c

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 4e258bd2ce6e735d14b06a5a45689dc0c460d2ac..04ad26c6fbc5ec076eb77ea16ee35bc7758d9823 100644 (file)
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -33,7 +33,6 @@
 
 #include "libudev.h"
 #include "libudev-private.h"
-#include "../udev.h"
 
 struct udev {
        int refcount;
@@ -48,7 +47,7 @@ struct udev {
        int selinux_enabled;
        security_context_t selinux_prev_scontext;
 #endif
-       int run:1;
+       int run;
 };
 
 void udev_log(struct udev *udev,
@@ -81,6 +80,7 @@ static void selinux_init(struct udev *udev)
         * restoration creation purposes.
         */
        udev->selinux_enabled = (is_selinux_enabled() > 0);
+       info(udev, "selinux=%i\n", udev->selinux_enabled);
        if (udev->selinux_enabled) {
                matchpathcon_init_prefix(NULL, udev_get_dev_path(udev));
                if (getfscreatecon(&udev->selinux_prev_scontext) < 0) {
@@ -166,9 +166,6 @@ struct udev *udev_new(void)
        if (udev == NULL)
                return NULL;
        memset(udev, 0x00, (sizeof(struct udev)));
-
-       selinux_init(udev);
-       sysfs_init();
        udev->refcount = 1;
        udev->log_fn = log_stderr;
        udev->log_priority = LOG_ERR;
@@ -176,7 +173,6 @@ struct udev *udev_new(void)
        udev->dev_path = strdup(UDEV_PREFIX "/dev");
        udev->sys_path = strdup("/sys");
        config_file = strdup(SYSCONFDIR "/udev/udev.conf");
-
        if (udev->dev_path == NULL ||
            udev->sys_path == NULL ||
            config_file == NULL)
@@ -187,24 +183,24 @@ struct udev *udev_new(void)
        if (env != NULL) {
                free(udev->sys_path);
                udev->sys_path = strdup(env);
-               remove_trailing_chars(udev->sys_path, '/');
+               util_remove_trailing_chars(udev->sys_path, '/');
        }
 
        env = getenv("UDEV_RUN");
-       if (env != NULL && !string_is_true(env))
+       if (env != NULL && strcmp(env, "0") == 0)
                udev->run = 0;
 
        env = getenv("UDEV_CONFIG_FILE");
        if (env != NULL) {
                free(config_file);
                config_file = strdup(env);
-               remove_trailing_chars(config_file, '/');
+               util_remove_trailing_chars(config_file, '/');
        }
        if (config_file == NULL)
                goto err;
        f = fopen(config_file, "r");
        if (f != NULL) {
-               char line[LINE_SIZE];
+               char line[UTIL_LINE_SIZE];
                int line_nr = 0;
 
                while (fgets(line, sizeof(line), f)) {
@@ -266,19 +262,19 @@ struct udev *udev_new(void)
                        }
 
                        if (strcasecmp(key, "udev_log") == 0) {
-                               udev->log_priority = log_priority(val);
+                               udev->log_priority = util_log_priority(val);
                                continue;
                        }
                        if (strcasecmp(key, "udev_root") == 0) {
                                free(udev->dev_path);
                                udev->dev_path = strdup(val);
-                               remove_trailing_chars(udev->dev_path, '/');
+                               util_remove_trailing_chars(udev->dev_path, '/');
                                continue;
                        }
                        if (strcasecmp(key, "udev_rules") == 0) {
                                free(udev->rules_path);
                                udev->rules_path = strdup(val);
-                               remove_trailing_chars(udev->rules_path, '/');
+                               util_remove_trailing_chars(udev->rules_path, '/');
                                continue;
                        }
                }
@@ -289,16 +285,16 @@ struct udev *udev_new(void)
        if (env != NULL) {
                free(udev->dev_path);
                udev->dev_path = strdup(env);
-               remove_trailing_chars(udev->dev_path, '/');
+               util_remove_trailing_chars(udev->dev_path, '/');
        }
 
        env = getenv("UDEV_LOG");
        if (env != NULL)
-               udev->log_priority = log_priority(env);
+               udev->log_priority = util_log_priority(env);
 
        if (udev->dev_path == NULL || udev->sys_path == NULL)
                goto err;
-
+       selinux_init(udev);
        info(udev, "context %p created\n", udev);
        info(udev, "log_priority=%d\n", udev->log_priority);
        info(udev, "config_file='%s'\n", config_file);
@@ -306,7 +302,6 @@ struct udev *udev_new(void)
        info(udev, "sys_path='%s'\n", udev->sys_path);
        if (udev->rules_path != NULL)
                info(udev, "rules_path='%s'\n", udev->rules_path);
-
        free(config_file);
        return udev;
 err:
@@ -347,7 +342,6 @@ void udev_unref(struct udev *udev)
        udev->refcount--;
        if (udev->refcount > 0)
                return;
-       sysfs_cleanup();
        selinux_exit(udev);
        free(udev->dev_path);
        free(udev->sys_path);