X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=5e204488d2e1462cce9d63a6e54aaa59af2b0e7a;hp=31c2a86ed1c1b3ce09ff99cd896a2a2c33b92837;hb=f22e9686fd4f8e602e8dc11a4b06765206f26edf;hpb=4ae6d03f394684722e7d5710fb2585e7c388f119

diff --git a/udev_config.c b/udev_config.c
index 31c2a86ed..5e204488d 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -45,9 +45,6 @@ char udev_root[PATH_MAX];
 char udev_db_path[PATH_MAX+NAME_MAX];
 char udev_rules_filename[PATH_MAX+NAME_MAX];
 char udev_config_filename[PATH_MAX+NAME_MAX];
-mode_t default_mode;
-char default_owner[USER_SIZE];
-char default_group[USER_SIZE];
 int udev_log;
 int udev_dev_d;
 int udev_hotplug_d;
@@ -74,10 +71,6 @@ static void init_variables(void)
 	strcpy(udev_config_filename, UDEV_CONFIG_FILE);
 	strcpy(udev_rules_filename, UDEV_RULES_FILE);
 
-	strcpy(default_owner, "root");
-	strcpy(default_group, "root");
-	default_mode = 0660;
-
 	udev_log = string_is_true(UDEV_LOG_DEFAULT);
 
 	udev_dev_d = 1;
@@ -91,41 +84,6 @@ static void init_variables(void)
 		udev_hotplug_d = 0;
 }
 
-int parse_get_pair(char **orig_string, char **left, char **right)
-{
-	char *temp;
-	char *string = *orig_string;
-
-	if (!string)
-		return -ENODEV;
-
-	/* eat any whitespace */
-	while (isspace(*string) || *string == ',')
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	*left = temp;
-	if (!string)
-		return -ENODEV;
-
-	/* take the right side and strip off the '"' */
-	while (isspace(*string))
-		++string;
-	if (*string == '"')
-		++string;
-	else
-		return -ENODEV;
-
-	temp = strsep(&string, "\"");
-	if (!string || *temp == '\0')
-		return -ENODEV;
-	*right = temp;
-	*orig_string = string;
-	
-	return 0;
-}
-
 static int parse_config_file(void)
 {
 	char line[LINE_SIZE];
@@ -204,28 +162,10 @@ static int parse_config_file(void)
 			continue;
 		}
 
-		if (strcasecmp(variable, "default_mode") == 0) {
-			default_mode = strtol(value, NULL, 8);
-			continue;
-		}
-
-		if (strcasecmp(variable, "default_owner") == 0) {
-			strfieldcpy(default_owner, value);
-			continue;
-		}
-
-		if (strcasecmp(variable, "default_group") == 0) {
-			strfieldcpy(default_group, value);
-			continue;
-		}
-
 		if (strcasecmp(variable, "udev_log") == 0) {
 			udev_log = string_is_true(value);
 			continue;
 		}
-
-		info("%s:%d:%Zd: unknown key '%s'",
-		     udev_config_filename, lineno, temp-line, temp);
 	}
 
 	file_unmap(buf, bufsize);
@@ -254,20 +194,13 @@ static void get_dirs(void)
 			strfieldcpy(udev_config_filename, temp);
 	}
 
-	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_path = %s", udev_db_path);
-	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
-	dbg_parse("udev_log = %d", udev_log);
-
 	parse_config_file();
-
-	dbg("udev_root = %s", udev_root);
-	dbg("udev_config_filename = %s", udev_config_filename);
-	dbg("udev_db_path = %s", udev_db_path);
-	dbg("udev_rules_filename = %s", udev_rules_filename);
-	dbg("udev_log = %d", udev_log);
+	dbg("sysfs_path='%s'", sysfs_path);
+	dbg("udev_root='%s'", udev_root);
+	dbg("udev_config_filename='%s'", udev_config_filename);
+	dbg("udev_db_path='%s'", udev_db_path);
+	dbg("udev_rules_filename='%s'", udev_rules_filename);
+	dbg("udev_log=%d", udev_log);
 }
 
 void udev_init_config(void)