/* 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;
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;
}
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++;
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;
}
}
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;
}
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;
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);
}