X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=2f2a69eb487a6fc1fc2e047df32ecc1bbee579ff;hp=204827407d389ff4388d564db77c1a815ede064d;hb=6e509e539b15ae882afd8ce3fafe1fbd33008509;hpb=d548032795b3c02aad606537a35ff63d954f1613

diff --git a/udev_config.c b/udev_config.c
index 204827407..2f2a69eb4 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;
 
@@ -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,6 +123,11 @@ 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", udev_config_filename, lineno);
+			continue;
+		}
+
 		memcpy(line, bufline, count);
 		line[count] = '\0';
 
@@ -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;
 
@@ -197,6 +195,6 @@ void udev_config_init(void)
 
 	dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
 	dbg("udev_root='%s'", udev_root);
-	dbg("udev_rules='%s'", udev_rules_filename);
+	dbg("udev_rules='%s'", udev_rules_dir);
 	dbg("udev_log=%d", udev_log_priority);
 }