X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_config.c;h=62eb728ea3283ec5c322bf7542699b1879e9b1fd;hb=e3686a8858ff0797af5daf97eef8c0fe08b5f46f;hp=ba2b3d2b886966eaa890d09673e9a64a310e79c8;hpb=3db7fa27027110fde92a1b6061fab434fe708e9f;p=elogind.git

diff --git a/udev_config.c b/udev_config.c
index ba2b3d2b8..62eb728ea 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -34,7 +34,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
@@ -42,19 +42,19 @@
 /* global variables */
 char sysfs_path[SYSFS_PATH_MAX];
 char udev_root[PATH_MAX];
-char udev_db_filename[PATH_MAX+NAME_MAX];
+char udev_db_path[PATH_MAX+NAME_MAX];
 char udev_permissions_filename[PATH_MAX+NAME_MAX];
 char udev_rules_filename[PATH_MAX+NAME_MAX];
 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];
+mode_t default_mode;
+char default_owner[USER_SIZE];
+char default_group[USER_SIZE];
 int udev_log;
-int udev_sleep;
 int udev_dev_d;
+int udev_hotplug_d;
 
 
-static int string_is_true(char *str)
+static int string_is_true(const char *str)
 {
 	if (strcasecmp(str, "true") == 0)
 		return 1;
@@ -67,27 +67,30 @@ static int string_is_true(char *str)
 
 static void init_variables(void)
 {
-	char *env;
-
-	/* fill up the defaults.  
-	 * If any config values are specified, they will
-	 * override these values. */
-	strfieldcpy(udev_root, UDEV_ROOT);
-	strfieldcpy(udev_db_filename, UDEV_DB);
-	strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
-	strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
-	strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
-	udev_log = string_is_true(UDEV_LOG_DEFAULT);
+	const char *env;
 
-	udev_sleep = 1;
-	env = getenv("UDEV_NO_SLEEP");
-	if (env && string_is_true(env))
-		udev_sleep = 0;
+	/* If any config values are specified, they will override these values. */
+	strcpy(udev_root, UDEV_ROOT);
+	strcpy(udev_db_path, UDEV_DB);
+	strcpy(udev_config_filename, UDEV_CONFIG_FILE);
+	strcpy(udev_rules_filename, UDEV_RULES_FILE);
+	strcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
+
+	strcpy(default_owner, "root");
+	strcpy(default_group, "root");
+	default_mode = 0600;
+
+	udev_log = string_is_true(UDEV_LOG_DEFAULT);
 
 	udev_dev_d = 1;
 	env = getenv("UDEV_NO_DEVD");
 	if (env && string_is_true(env))
 		udev_dev_d = 0;
+
+	udev_hotplug_d = 1;
+	env = getenv("UDEV_NO_HOTPLUGD");
+	if (env && string_is_true(env))
+		udev_hotplug_d = 0;
 }
 
 int parse_get_pair(char **orig_string, char **left, char **right)
@@ -187,39 +190,40 @@ static int parse_config_file(void)
 
 		if (strcasecmp(variable, "udev_root") == 0) {
 			strfieldcpy(udev_root, value);
-			leading_slash(udev_root);
+			no_trailing_slash(udev_root);
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_db") == 0) {
-			strfieldcpy(udev_db_filename, value);
+			strfieldcpy(udev_db_path, value);
+			no_trailing_slash(udev_db_path);
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_rules") == 0) {
 			strfieldcpy(udev_rules_filename, value);
-			no_leading_slash(udev_rules_filename);
+			no_trailing_slash(udev_rules_filename);
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_permissions") == 0) {
 			strfieldcpy(udev_permissions_filename, value);
-			no_leading_slash(udev_permissions_filename);
+			no_trailing_slash(udev_permissions_filename);
 			continue;
 		}
 
 		if (strcasecmp(variable, "default_mode") == 0) {
-			strfieldcpy(default_mode_str, value);
+			default_mode = strtol(value, NULL, 8);
 			continue;
 		}
 
 		if (strcasecmp(variable, "default_owner") == 0) {
-			strfieldcpy(default_owner_str, value);
+			strfieldcpy(default_owner, value);
 			continue;
 		}
 
 		if (strcasecmp(variable, "default_group") == 0) {
-			strfieldcpy(default_group_str, value);
+			strfieldcpy(default_group, value);
 			continue;
 		}
 
@@ -250,7 +254,7 @@ static void get_dirs(void)
 		temp = getenv("SYSFS_PATH");
 		if (temp != NULL) {
 			strfieldcpy(sysfs_path, temp);
-			no_leading_slash(sysfs_path);
+			no_trailing_slash(sysfs_path);
 		}
 
 		temp = getenv("UDEV_CONFIG_FILE");
@@ -261,7 +265,7 @@ static void get_dirs(void)
 	dbg("sysfs_path='%s'", sysfs_path);
 	dbg_parse("udev_root = %s", udev_root);
 	dbg_parse("udev_config_filename = %s", udev_config_filename);
-	dbg_parse("udev_db_filename = %s", udev_db_filename);
+	dbg_parse("udev_db_path = %s", udev_db_path);
 	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
 	dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
 	dbg_parse("udev_log = %d", udev_log);
@@ -270,10 +274,10 @@ static void get_dirs(void)
 
 	dbg("udev_root = %s", udev_root);
 	dbg("udev_config_filename = %s", udev_config_filename);
-	dbg("udev_db_filename = %s", udev_db_filename);
+	dbg("udev_db_path = %s", udev_db_path);
 	dbg("udev_rules_filename = %s", udev_rules_filename);
 	dbg("udev_permissions_filename = %s", udev_permissions_filename);
-	dbg("udev_log_str = %d", udev_log);
+	dbg("udev_log = %d", udev_log);
 }
 
 void udev_init_config(void)