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=a7e19fe8646f6ea80e352299cec621a31a33694f;hb=53ba69a0c2c48ad87cc597518f529812c9a6a69e;hpb=1aa1e24848903d11780db1ade355be73ad61a937

diff --git a/udev_config.c b/udev_config.c
index a7e19fe86..42190945f 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -1,8 +1,6 @@
 /*
- * udev_config.c
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004, 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -15,7 +13,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -33,7 +31,7 @@
 /* global variables */
 char udev_root[PATH_SIZE];
 char udev_config_filename[PATH_SIZE];
-char udev_rules_filename[PATH_SIZE];
+char udev_rules_dir[PATH_SIZE];
 int udev_log_priority;
 int udev_run;
 
@@ -100,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;
 	}
 
@@ -113,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++;
@@ -130,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;
 		}
 
@@ -147,8 +145,8 @@ static int parse_config_file(void)
 		}
 
 		if (strcasecmp(variable, "udev_rules") == 0) {
-			strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
-			remove_trailing_chars(udev_rules_filename, '/');
+			strlcpy(udev_rules_dir, value, sizeof(udev_rules_dir));
+			remove_trailing_chars(udev_rules_dir, '/');
 			continue;
 		}
 
@@ -168,7 +166,7 @@ void udev_config_init(void)
 
 	strcpy(udev_root, UDEV_ROOT);
 	strcpy(udev_config_filename, UDEV_CONFIG_FILE);
-	strcpy(udev_rules_filename, UDEV_RULES_FILE);
+	strcpy(udev_rules_dir, UDEV_RULES_DIR);
 	udev_log_priority = LOG_ERR;
 	udev_run = 1;
 
@@ -195,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_filename);
-	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);
 }