X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_config.c;h=ae755f39fde82515b563d3892e750396227a7209;hb=e5e2ea95a4b21ebc5297881e7e8c5ab4425bac5e;hp=51a91d009260db4b12a4710493818059863b9e56;hpb=aef6bb132ef2f5b4c446e42f6050033d4f5c177b;p=elogind.git

diff --git a/udev_config.c b/udev_config.c
index 51a91d009..ae755f39f 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -50,7 +50,6 @@ char default_mode_str[MODE_SIZE];
 char default_owner_str[OWNER_SIZE];
 char default_group_str[GROUP_SIZE];
 int udev_log;
-int udev_sleep;
 int udev_dev_d;
 
 
@@ -60,11 +59,15 @@ static int string_is_true(char *str)
 		return 1;
 	if (strcasecmp(str, "yes") == 0)
 		return 1;
+	if (strcasecmp(str, "1") == 0)
+		return 1;
 	return 0;
 }
 
 static void init_variables(void)
 {
+	char *env;
+
 	/* fill up the defaults.  
 	 * If any config values are specified, they will
 	 * override these values. */
@@ -75,12 +78,9 @@ static void init_variables(void)
 	strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
 	udev_log = string_is_true(UDEV_LOG_DEFAULT);
 
-	udev_sleep = 1;
-	if (getenv("UDEV_NO_SLEEP") != NULL)
-		udev_sleep = 0;
-
 	udev_dev_d = 1;
-	if (getenv("UDEV_NO_DEVD") != NULL)
+	env = getenv("UDEV_NO_DEVD");
+	if (env && string_is_true(env))
 		udev_dev_d = 0;
 }
 
@@ -121,7 +121,8 @@ int parse_get_pair(char **orig_string, char **left, char **right)
 
 static int parse_config_file(void)
 {
-	char line[255];
+	char line[LINE_SIZE];
+	char *bufline;
 	char *temp;
 	char *variable;
 	char *value;
@@ -142,32 +143,35 @@ static int parse_config_file(void)
 	/* loop through the whole file */
 	lineno = 0;
 	cur = 0;
-	while (1) {
+	while (cur < bufsize) {
 		count = buf_get_line(buf, bufsize, cur);
-
-		strncpy(line, buf + cur, count);
-		line[count] = '\0';
-		temp = line;
-		lineno++;
-
+		bufline = &buf[cur];
 		cur += count+1;
-		if (cur > bufsize)
-			break;
-
-		dbg_parse("read '%s'", temp);
+		lineno++;
 
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
+		if (count >= LINE_SIZE) {
+			info("line too long, conf line skipped %s, line %d",
+					udev_config_filename, lineno);
+			continue;
+		}
 
-		/* empty line? */
-		if (*temp == 0x00)
+		/* eat the whitespace */
+		while ((count > 0) && isspace(bufline[0])) {
+			bufline++;
+			count--;
+		}
+		if (count == 0)
 			continue;
 
 		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
+		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
+		strncpy(line, bufline, count);
+		line[count] = '\0';
+		temp = line;
+		dbg_parse("read '%s'", temp);
+
 		retval = parse_get_pair(&temp, &variable, &value);
 		if (retval != 0)
 			info("%s:%d:%Zd: error parsing '%s'",