X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=42190945fc18b7ace35e86deb4b094d8a5eeb574;hp=3f226b9d7cd2f0e21a9ca3b1cdb56459dcbb37ff;hb=41677cf51fb2c14aa512ecf9410e43eb35560408;hpb=9dd0c2573b1e3a6f18356e4db6cee5e5329ecb67

diff --git a/udev_config.c b/udev_config.c
index 3f226b9d7..42190945f 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -98,7 +98,7 @@ static int parse_config_file(void)
 	int retval = 0;
 
 	if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
-		err("can't open '%s' as config file: %s", udev_config_filename, strerror(errno));
+		err("can't open '%s' as config file: %s\n", udev_config_filename, strerror(errno));
 		return -ENODEV;
 	}
 
@@ -111,11 +111,6 @@ static int parse_config_file(void)
 		cur += count+1;
 		lineno++;
 
-		if (count >= sizeof(line)) {
-			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-			continue;
-		}
-
 		/* eat the whitespace */
 		while ((count > 0) && isspace(bufline[0])) {
 			bufline++;
@@ -128,13 +123,18 @@ static int parse_config_file(void)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
+		if (count >= sizeof(line)) {
+			err("line too long, conf line skipped %s, line %d\n", udev_config_filename, lineno);
+			continue;
+		}
+
 		memcpy(line, bufline, count);
 		line[count] = '\0';
 
 		linepos = line;
 		retval = get_key(&linepos, &variable, &value);
 		if (retval != 0) {
-			err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int)(linepos-line));
+			err("error parsing %s, line %d:%d\n", udev_config_filename, lineno, (int)(linepos-line));
 			continue;
 		}
 
@@ -193,8 +193,8 @@ void udev_config_init(void)
 	if (env)
 		udev_log_priority = log_priority(env);
 
-	dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
-	dbg("udev_root='%s'", udev_root);
-	dbg("udev_rules='%s'", udev_rules_dir);
-	dbg("udev_log=%d", udev_log_priority);
+	dbg("UDEV_CONFIG_FILE='%s'\n", udev_config_filename);
+	dbg("udev_root='%s'\n", udev_root);
+	dbg("udev_rules='%s'\n", udev_rules_dir);
+	dbg("udev_log=%d\n", udev_log_priority);
 }