X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=26ecf6291c8a2a856825081b1090b5fd386cb70b;hp=da8c676d04f9a49f455f02e2053101fe3f758425;hb=2b40452ab3146322a88ae201a2eb534204c75d63;hpb=9f8dfa19cfd2b502bf794f39a421cbb7c4cc0404

diff --git a/udev_config.c b/udev_config.c
index da8c676d0..26ecf6291 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -33,6 +33,7 @@
 #include <ctype.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
@@ -40,14 +41,11 @@
 #include "namedev.h"
 
 /* global variables */
-char sysfs_path[SYSFS_PATH_MAX];
-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];
+char sysfs_path[PATH_SIZE];
+char udev_root[PATH_SIZE];
+char udev_db_path[PATH_SIZE];
+char udev_rules_filename[PATH_SIZE];
+char udev_config_filename[PATH_SIZE];
 int udev_log;
 int udev_dev_d;
 int udev_hotplug_d;
@@ -74,10 +72,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;
@@ -105,12 +99,11 @@ static int parse_config_file(void)
 	int lineno;
 	int retval = 0;
 
-	if (file_map(udev_config_filename, &buf, &bufsize) == 0) {
-		dbg("reading '%s' as config file", udev_config_filename);
-	} else {
+	if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
 		dbg("can't open '%s' as config file", udev_config_filename);
 		return -ENODEV;
 	}
+	dbg("reading '%s' as config file", udev_config_filename);
 
 	/* loop through the whole file */
 	lineno = 0;
@@ -121,7 +114,7 @@ static int parse_config_file(void)
 		cur += count+1;
 		lineno++;
 
-		if (count >= LINE_SIZE) {
+		if (count >= sizeof(line)) {
 			info("line too long, conf line skipped %s, line %d",
 					udev_config_filename, lineno);
 			continue;
@@ -139,8 +132,7 @@ static int parse_config_file(void)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
-		strncpy(line, bufline, count);
-		line[count] = '\0';
+		strlcpy(line, bufline, count);
 		temp = line;
 		dbg_parse("read '%s'", temp);
 
@@ -152,45 +144,27 @@ static int parse_config_file(void)
 		dbg_parse("variable='%s', value='%s'", variable, value);
 
 		if (strcasecmp(variable, "udev_root") == 0) {
-			strfieldcpy(udev_root, value);
+			strlcpy(udev_root, value, sizeof(udev_root));
 			no_trailing_slash(udev_root);
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_db") == 0) {
-			strfieldcpy(udev_db_path, value);
+			strlcpy(udev_db_path, value, sizeof(udev_db_path));
 			no_trailing_slash(udev_db_path);
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_rules") == 0) {
-			strfieldcpy(udev_rules_filename, value);
+			strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
 			no_trailing_slash(udev_rules_filename);
 			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);
@@ -202,7 +176,7 @@ static void get_dirs(void)
 	char *temp;
 	int retval;
 
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+	retval = sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 	if (retval)
 		dbg("sysfs_get_mnt_path failed");
 
@@ -210,13 +184,13 @@ static void get_dirs(void)
 	if (getenv("UDEV_TEST") != NULL) {
 		temp = getenv("SYSFS_PATH");
 		if (temp != NULL) {
-			strfieldcpy(sysfs_path, temp);
+			strlcpy(sysfs_path, temp, sizeof(sysfs_path));
 			no_trailing_slash(sysfs_path);
 		}
 
 		temp = getenv("UDEV_CONFIG_FILE");
 		if (temp != NULL)
-			strfieldcpy(udev_config_filename, temp);
+			strlcpy(udev_config_filename, temp, sizeof(udev_config_filename));
 	}
 
 	parse_config_file();