X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=884cb7098c12559f6b31c727eabda1cf4a3809c3;hp=8a793ffded484552bcdf1bca23bb10f4f044379d;hb=c70560feef0eb61a150cd2f956f0beead4313ffe;hpb=1d918b50cddc975abbfd06af134a6d843d9bc7f0 diff --git a/udev_rules.c b/udev_rules.c index 8a793ffde..884cb7098 100644 --- a/udev_rules.c +++ b/udev_rules.c @@ -48,13 +48,13 @@ static char *get_format_attribute(char **str) if (*str[0] == '{') { pos = strchr(*str, '}'); if (pos == NULL) { - err("missing closing brace for format"); + err("missing closing brace for format\n"); return NULL; } pos[0] = '\0'; attr = *str+1; *str = pos+1; - dbg("attribute='%s', str='%s'", attr, *str); + dbg("attribute='%s', str='%s'\n", attr, *str); } return attr; } @@ -69,10 +69,10 @@ static int get_format_len(char **str) num = (int) strtoul(*str, &tail, 10); if (num > 0) { *str = tail; - dbg("format length=%i", num); + dbg("format length=%i\n", num); return num; } else { - err("format parsing error '%s'", *str); + err("format parsing error '%s'\n", *str); } } return -1; @@ -148,7 +148,7 @@ static int run_program(const char *command, const char *subsystem, } else { argv[i] = strsep(&pos, " "); } - dbg("arg[%i] '%s'", i, argv[i]); + dbg("arg[%i] '%s'\n", i, argv[i]); i++; } argv[i] = NULL; @@ -156,18 +156,18 @@ static int run_program(const char *command, const char *subsystem, argv[0] = arg; argv[1] = NULL; } - info("'%s'", command); + info("'%s'\n", command); /* prepare pipes from child to parent */ if (result != NULL || udev_log_priority >= LOG_INFO) { if (pipe(outpipe) != 0) { - err("pipe failed: %s", strerror(errno)); + err("pipe failed: %s\n", strerror(errno)); return -1; } } if (udev_log_priority >= LOG_INFO) { if (pipe(errpipe) != 0) { - err("pipe failed: %s", strerror(errno)); + err("pipe failed: %s\n", strerror(errno)); return -1; } } @@ -198,7 +198,7 @@ static int run_program(const char *command, const char *subsystem, dup2(devnull, STDERR_FILENO); close(devnull); } else - err("open /dev/null failed: %s", strerror(errno)); + err("open /dev/null failed: %s\n", strerror(errno)); if (outpipe[WRITE_END] > 0) { dup2(outpipe[WRITE_END], STDOUT_FILENO); close(outpipe[WRITE_END]); @@ -210,14 +210,14 @@ static int run_program(const char *command, const char *subsystem, execv(argv[0], argv); if (errno == ENOENT || errno == ENOTDIR) { /* may be on a filesytem which is not mounted right now */ - info("program '%s' not found", argv[0]); + info("program '%s' not found\n", argv[0]); } else { /* other problems */ - err("exec of program '%s' failed", argv[0]); + err("exec of program '%s' failed\n", argv[0]); } _exit(1); case -1: - err("fork of '%s' failed: %s", argv[0], strerror(errno)); + err("fork of '%s' failed: %s\n", argv[0], strerror(errno)); return -1; default: /* read from child if requested */ @@ -260,7 +260,7 @@ static int run_program(const char *command, const char *subsystem, close(outpipe[READ_END]); outpipe[READ_END] = -1; if (count < 0) { - err("stdin read failed: %s", strerror(errno)); + err("stdin read failed: %s\n", strerror(errno)); retval = -1; } continue; @@ -273,14 +273,14 @@ static int run_program(const char *command, const char *subsystem, memcpy(&result[respos], inbuf, count); respos += count; } else { - err("ressize %ld too short", (long)ressize); + err("ressize %ld too short\n", (long)ressize); retval = -1; } } pos = inbuf; while ((line = strsep(&pos, "\n"))) if (pos || line[0] != '\0') - info("'%s' (stdout) '%s'", argv[0], line); + info("'%s' (stdout) '%s'\n", argv[0], line); } /* get stderr */ @@ -294,14 +294,14 @@ static int run_program(const char *command, const char *subsystem, close(errpipe[READ_END]); errpipe[READ_END] = -1; if (count < 0) - err("stderr read failed: %s", strerror(errno)); + err("stderr read failed: %s\n", strerror(errno)); continue; } errbuf[count] = '\0'; pos = errbuf; while ((line = strsep(&pos, "\n"))) if (pos || line[0] != '\0') - info("'%s' (stderr) '%s'", argv[0], line); + info("'%s' (stderr) '%s'\n", argv[0], line); } } if (outpipe[READ_END] > 0) @@ -312,18 +312,18 @@ static int run_program(const char *command, const char *subsystem, /* return the childs stdout string */ if (result) { result[respos] = '\0'; - dbg("result='%s'", result); + dbg("result='%s'\n", result); if (reslen) *reslen = respos; } } waitpid(pid, &status, 0); if (WIFEXITED(status)) { - info("'%s' returned with status %i", argv[0], WEXITSTATUS(status)); + info("'%s' returned with status %i\n", argv[0], WEXITSTATUS(status)); if (WEXITSTATUS(status) != 0) retval = -1; } else { - err("'%s' abnormal exit", argv[0]); + err("'%s' abnormal exit\n", argv[0]); retval = -1; } } @@ -364,7 +364,7 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu continue; if (count >= sizeof(line)) { - err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno); + err("line too long, conf line skipped %s, line %d\n", udev_config_filename, lineno); continue; } @@ -373,11 +373,11 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu linepos = line; if (get_key(&linepos, &variable, &value) == 0) { - dbg("import '%s=%s'", variable, value); + dbg("import '%s=%s'\n", variable, value); /* handle device, renamed by external tool, returning new path */ if (strcmp(variable, "DEVPATH") == 0) { - info("updating devpath from '%s' to '%s'", udev->dev->devpath, value); + info("updating devpath from '%s' to '%s'\n", udev->dev->devpath, value); sysfs_device_set_values(udev->dev, value, NULL, NULL); } else name_list_key_add(&udev->env_list, variable, value); @@ -394,7 +394,7 @@ static int import_file_into_env(struct udevice *udev, const char *filename) size_t bufsize; if (file_map(filename, &buf, &bufsize) != 0) { - err("can't open '%s': %s", filename, strerror(errno)); + err("can't open '%s': %s\n", filename, strerror(errno)); return -1; } import_keys_into_env(udev, buf, bufsize); @@ -423,13 +423,13 @@ static int import_parent_into_env(struct udevice *udev, const char *filter) struct udevice *udev_parent; struct name_entry *name_loop; - dbg("found parent '%s', get the node name", dev_parent->devpath); + dbg("found parent '%s', get the node name\n", dev_parent->devpath); udev_parent = udev_device_init(NULL); if (udev_parent == NULL) return -1; /* import the udev_db of the parent */ if (udev_db_get_device(udev_parent, dev_parent->devpath) == 0) { - dbg("import stored parent env '%s'", udev_parent->name); + dbg("import stored parent env '%s'\n", udev_parent->name); list_for_each_entry(name_loop, &udev_parent->env_list, node) { char name[NAME_SIZE]; char *pos; @@ -440,16 +440,16 @@ static int import_parent_into_env(struct udevice *udev, const char *filter) pos[0] = '\0'; pos++; if (fnmatch(filter, name, 0) == 0) { - dbg("import key '%s'", name_loop->name); + dbg("import key '%s'\n", name_loop->name); name_list_add(&udev->env_list, name_loop->name, 0); setenv(name, pos, 1); } else - dbg("skip key '%s'", name_loop->name); + dbg("skip key '%s'\n", name_loop->name); } } rc = 0; } else - dbg("parent not found in database"); + dbg("parent not found in database\n"); udev_device_cleanup(udev_parent); } @@ -468,7 +468,7 @@ static int pass_env_to_socket(const char *sockpath, const char *devpath, const c ssize_t count; int retval = 0; - dbg("pass environment to socket '%s'", sockpath); + dbg("pass environment to socket '%s'\n", sockpath); sock = socket(AF_LOCAL, SOCK_DGRAM, 0); memset(&saddr, 0x00, sizeof(struct sockaddr_un)); saddr.sun_family = AF_LOCAL; @@ -498,7 +498,7 @@ static int pass_env_to_socket(const char *sockpath, const char *devpath, const c count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, saddrlen); if (count < 0) retval = -1; - info("passed %zi bytes to socket '%s', ", count, sockpath); + info("passed %zi bytes to socket '%s', \n", count, sockpath); close(sock); return retval; @@ -509,7 +509,7 @@ int udev_rules_run(struct udevice *udev) struct name_entry *name_loop; int retval = 0; - dbg("executing run list"); + dbg("executing run list\n"); list_for_each_entry(name_loop, &udev->run_list, node) { if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) { pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action); @@ -541,22 +541,22 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout) strlcat(filepath, "/", sizeof(filepath)); strlcat(filepath, file, sizeof(filepath)); - dbg("will wait %i sec for '%s'", timeout, filepath); + dbg("will wait %i sec for '%s'\n", timeout, filepath); while (--loop) { /* lookup file */ if (stat(filepath, &stats) == 0) { - info("file '%s' appeared after %i loops", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1); + info("file '%s' appeared after %i loops\n", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1); return 0; } /* make sure, the device did not disappear in the meantime */ if (stat(devicepath, &stats) != 0) { - info("device disappeared while waiting for '%s'", filepath); + info("device disappeared while waiting for '%s'\n", filepath); return -2; } - info("wait for '%s' for %i mseconds", filepath, 1000 / WAIT_LOOP_PER_SECOND); + info("wait for '%s' for %i mseconds\n", filepath, 1000 / WAIT_LOOP_PER_SECOND); usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND); } - info("waiting for '%s' failed", filepath); + info("waiting for '%s' failed\n", filepath); return -1; } @@ -707,12 +707,12 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize) if (strncasecmp(&head[1], subst->name, strlen(subst->name)) == 0) { type = subst->type; tail = head + strlen(subst->name)+1; - dbg("will substitute format name '%s'", subst->name); + dbg("will substitute format name '%s'\n", subst->name); goto found; } } head[0] = '$'; - err("unknown format variable '%s'", head); + err("unknown format variable '%s'\n", head); } else if (head[0] == '%') { /* substitute format char */ if (head[1] == '\0') @@ -730,12 +730,12 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize) if (tail[0] == subst->fmt) { type = subst->type; tail++; - dbg("will substitute format char '%c'", subst->fmt); + dbg("will substitute format char '%c'\n", subst->fmt); goto found; } } head[0] = '%'; - err("unknown format char '%c'", tail[0]); + err("unknown format char '%c'\n", tail[0]); } head++; } @@ -743,42 +743,42 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize) found: attr = get_format_attribute(&tail); strlcpy(temp, tail, sizeof(temp)); - dbg("format=%i, string='%s', tail='%s'", type ,string, tail); + dbg("format=%i, string='%s', tail='%s'\n", type ,string, tail); switch (type) { case SUBST_DEVPATH: strlcat(string, udev->dev->devpath, maxsize); - dbg("substitute devpath '%s'", udev->dev->devpath); + dbg("substitute devpath '%s'\n", udev->dev->devpath); break; case SUBST_KERNEL: strlcat(string, udev->dev->kernel, maxsize); - dbg("substitute kernel name '%s'", udev->dev->kernel); + dbg("substitute kernel name '%s'\n", udev->dev->kernel); break; case SUBST_KERNEL_NUMBER: strlcat(string, udev->dev->kernel_number, maxsize); - dbg("substitute kernel number '%s'", udev->dev->kernel_number); + dbg("substitute kernel number '%s'\n", udev->dev->kernel_number); break; case SUBST_ID: if (udev->dev_parent != NULL) { strlcat(string, udev->dev_parent->kernel, maxsize); - dbg("substitute id '%s'", udev->dev_parent->kernel); + dbg("substitute id '%s'\n", udev->dev_parent->kernel); } break; case SUBST_DRIVER: if (udev->dev_parent != NULL) { strlcat(string, udev->dev_parent->driver, maxsize); - dbg("substitute driver '%s'", udev->dev_parent->driver); + dbg("substitute driver '%s'\n", udev->dev_parent->driver); } break; case SUBST_MAJOR: sprintf(temp2, "%d", major(udev->devt)); strlcat(string, temp2, maxsize); - dbg("substitute major number '%s'", temp2); + dbg("substitute major number '%s'\n", temp2); break; case SUBST_MINOR: sprintf(temp2, "%d", minor(udev->devt)); strlcat(string, temp2, maxsize); - dbg("substitute minor number '%s'", temp2); + dbg("substitute minor number '%s'\n", temp2); break; case SUBST_RESULT: if (udev->program_result[0] == '\0') @@ -788,7 +788,7 @@ found: if (attr != NULL) i = strtoul(attr, &rest, 10); if (i > 0) { - dbg("request part #%d of result string", i); + dbg("request part #%d of result string\n", i); cpos = udev->program_result; while (--i) { while (cpos[0] != '\0' && !isspace(cpos[0])) @@ -797,7 +797,7 @@ found: cpos++; } if (i > 0) { - err("requested part of result string not found"); + err("requested part of result string not found\n"); break; } strlcpy(temp2, cpos, sizeof(temp2)); @@ -808,15 +808,15 @@ found: cpos[0] = '\0'; } strlcat(string, temp2, maxsize); - dbg("substitute part of result string '%s'", temp2); + dbg("substitute part of result string '%s'\n", temp2); } else { strlcat(string, udev->program_result, maxsize); - dbg("substitute result string '%s'", udev->program_result); + dbg("substitute result string '%s'\n", udev->program_result); } break; case SUBST_ATTR: if (attr == NULL) - err("missing file parameter for attr"); + err("missing file parameter for attr\n"); else { char devpath[PATH_SIZE]; char *attrib; @@ -839,7 +839,7 @@ found: struct sysfs_device *dev_parent = udev->dev; do { - dbg("looking at '%s'", dev_parent->devpath); + dbg("looking at '%s'\n", dev_parent->devpath); value = sysfs_attr_get_value(dev_parent->devpath, attr); if (value != NULL) { strlcpy(temp2, value, sizeof(temp2)); @@ -860,9 +860,9 @@ found: temp2[--size] = '\0'; count = replace_chars(temp2, ALLOWED_CHARS_INPUT); if (count > 0) - info("%i character(s) replaced" , count); + info("%i character(s) replaced\n" , count); strlcat(string, temp2, maxsize); - dbg("substitute sysfs value '%s'", temp2); + dbg("substitute sysfs value '%s'\n", temp2); } break; case SUBST_PARENT: @@ -873,15 +873,15 @@ found: if (dev_parent != NULL) { struct udevice *udev_parent; - dbg("found parent '%s', get the node name", dev_parent->devpath); + dbg("found parent '%s', get the node name\n", dev_parent->devpath); udev_parent = udev_device_init(NULL); if (udev_parent != NULL) { /* lookup the name in the udev_db with the DEVPATH of the parent */ if (udev_db_get_device(udev_parent, dev_parent->devpath) == 0) { strlcat(string, udev_parent->name, maxsize); - dbg("substitute parent node name'%s'", udev_parent->name); + dbg("substitute parent node name'%s'\n", udev_parent->name); } else - dbg("parent not found in database"); + dbg("parent not found in database\n"); udev_device_cleanup(udev_parent); } } @@ -889,48 +889,48 @@ found: break; case SUBST_TEMP_NODE: if (udev->tmp_node[0] == '\0' && major(udev->devt) > 0) { - dbg("create temporary device node for callout"); + dbg("create temporary device node for callout\n"); snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u", udev_root, major(udev->devt), minor(udev->devt)); udev->tmp_node[sizeof(udev->tmp_node)-1] = '\0'; udev_node_mknod(udev, udev->tmp_node, udev->devt, 0600, 0, 0); } strlcat(string, udev->tmp_node, maxsize); - dbg("substitute temporary device node name '%s'", udev->tmp_node); + dbg("substitute temporary device node name '%s'\n", udev->tmp_node); break; case SUBST_NAME: strlcat(string, udev->name, maxsize); - dbg("substitute udev->name '%s'", udev->name); + dbg("substitute udev->name '%s'\n", udev->name); break; case SUBST_ROOT: strlcat(string, udev_root, maxsize); - dbg("substitute udev_root '%s'", udev_root); + dbg("substitute udev_root '%s'\n", udev_root); break; case SUBST_SYS: strlcat(string, sysfs_path, maxsize); - dbg("substitute sysfs_path '%s'", sysfs_path); + dbg("substitute sysfs_path '%s'\n", sysfs_path); break; case SUBST_ENV: if (attr == NULL) { - dbg("missing attribute"); + dbg("missing attribute\n"); break; } pos = getenv(attr); if (pos == NULL) { - dbg("env '%s' not available", attr); + dbg("env '%s' not available\n", attr); break; } - dbg("substitute env '%s=%s'", attr, pos); + dbg("substitute env '%s=%s'\n", attr, pos); strlcat(string, pos, maxsize); break; default: - err("unknown substitution type=%i", type); + err("unknown substitution type=%i\n", type); break; } /* possibly truncate to format-char specified length */ if (len >= 0 && len < (int)strlen(head)) { head[len] = '\0'; - dbg("truncate to %i chars, subtitution string becomes '%s'", len, head); + dbg("truncate to %i chars, subtitution string becomes '%s'\n", len, head); } strlcat(string, temp, maxsize); } @@ -960,7 +960,7 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k /* look for a matching string, parts are separated by '|' */ strlcpy(value, rule->buf + key->val_off, sizeof(value)); key_value = value; - dbg("key %s value='%s'", key_name, key_value); + dbg("key %s value='%s'\n", key_name, key_value); while (key_value) { pos = strchr(key_value, '|'); if (pos) { @@ -968,7 +968,7 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k pos++; } - dbg("match %s '%s' <-> '%s'", key_name, key_value, val); + dbg("match %s '%s' <-> '%s'\n", key_name, key_value, val); match = (fnmatch(key_value, val, 0) == 0); if (match) break; @@ -977,11 +977,11 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k } if (match && (key->operation == KEY_OP_MATCH)) { - dbg("%s is true (matching value)", key_name); + dbg("%s is true (matching value)\n", key_name); return 0; } if (!match && (key->operation == KEY_OP_NOMATCH)) { - dbg("%s is true (non-matching value)", key_name); + dbg("%s is true (non-matching value)\n", key_name); return 0; } return -1; @@ -1037,7 +1037,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule) const char *value = getenv(key_name); if (!value) { - dbg("ENV{'%s'} is not set, treat as empty", key_name); + dbg("ENV{'%s'} is not set, treat as empty\n", key_name); value = ""; } if (match_key("ENV", rule, &pair->key, value)) @@ -1076,10 +1076,10 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule) attr_subst_subdir(filename, sizeof(filename)); match = (stat(filename, &statbuf) == 0); - info("'%s' %s", filename, match ? "exists" : "does not exist"); + info("'%s' %s", filename, match ? "exists" : "does not exist\n"); if (match && rule->test_mode_mask > 0) { match = ((statbuf.st_mode & rule->test_mode_mask) > 0); - info("'%s' has mode=%#o and %s %#o", filename, statbuf.st_mode, + info("'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode, match ? "matches" : "does not match", rule->test_mode_mask); } @@ -1087,7 +1087,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule) goto nomatch; if (!match && rule->test.operation == KEY_OP_MATCH) goto nomatch; - dbg("TEST key is true"); + dbg("TEST key is true\n"); } if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) { @@ -1130,7 +1130,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule) len = strlen(val); while (len > 0 && isspace(val[len-1])) val[--len] = '\0'; - dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val); + dbg("removed %zi trailing whitespace chars from '%s'\n", strlen(val)-len, val); } if (match_key("ATTR", rule, &pair->key, val)) @@ -1178,7 +1178,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule) len = strlen(val); while (len > 0 && isspace(val[len-1])) val[--len] = '\0'; - dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val); + dbg("removed %zi trailing whitespace chars from '%s'\n", strlen(val)-len, val); } if (match_key("ATTRS", rule, &pair->key, val)) @@ -1190,12 +1190,12 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule) break; try_parent: /* move to parent device */ - dbg("try parent sysfs device"); + dbg("try parent sysfs device\n"); udev->dev_parent = sysfs_device_get_parent(udev->dev_parent); if (udev->dev_parent == NULL) goto nomatch; - dbg("looking at dev_parent->devpath='%s'", udev->dev_parent->devpath); - dbg("looking at dev_parent->kernel='%s'", udev->dev_parent->kernel); + dbg("looking at dev_parent->devpath='%s'\n", udev->dev_parent->devpath); + dbg("looking at dev_parent->kernel='%s'\n", udev->dev_parent->kernel); } /* execute external program */ @@ -1206,28 +1206,28 @@ try_parent: strlcpy(program, key_val(rule, &rule->program), sizeof(program)); udev_rules_apply_format(udev, program, sizeof(program)); if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL) != 0) { - dbg("PROGRAM is false"); + dbg("PROGRAM is false\n"); udev->program_result[0] = '\0'; if (rule->program.operation != KEY_OP_NOMATCH) goto nomatch; } else { int count; - dbg("PROGRAM matches"); + dbg("PROGRAM matches\n"); remove_trailing_chars(result, '\n'); if (rule->string_escape == ESCAPE_UNSET || rule->string_escape == ESCAPE_REPLACE) { count = replace_chars(result, ALLOWED_CHARS_INPUT); if (count > 0) - info("%i character(s) replaced" , count); + info("%i character(s) replaced\n" , count); } - dbg("result is '%s'", result); + dbg("result is '%s'\n", result); strlcpy(udev->program_result, result, sizeof(udev->program_result)); - dbg("PROGRAM returned successful"); + dbg("PROGRAM returned successful\n"); if (rule->program.operation == KEY_OP_NOMATCH) goto nomatch; } - dbg("PROGRAM key is true"); + dbg("PROGRAM key is true\n"); } /* check for matching result of external program */ @@ -1241,23 +1241,23 @@ try_parent: strlcpy(import, key_val(rule, &rule->import), sizeof(import)); udev_rules_apply_format(udev, import, sizeof(import)); - dbg("check for IMPORT import='%s'", import); + dbg("check for IMPORT import='%s'\n", import); if (rule->import_type == IMPORT_PROGRAM) { rc = import_program_into_env(udev, import); } else if (rule->import_type == IMPORT_FILE) { - dbg("import file import='%s'", import); + dbg("import file import='%s'\n", import); rc = import_file_into_env(udev, import); } else if (rule->import_type == IMPORT_PARENT) { - dbg("import parent import='%s'", import); + dbg("import parent import='%s'\n", import); rc = import_parent_into_env(udev, import); } if (rc != 0) { - dbg("IMPORT failed"); + dbg("IMPORT failed\n"); if (rule->import.operation != KEY_OP_NOMATCH) goto nomatch; } else - dbg("IMPORT '%s' imported", key_val(rule, &rule->import)); - dbg("IMPORT key is true"); + dbg("IMPORT '%s' imported\n", key_val(rule, &rule->import)); + dbg("IMPORT key is true\n"); } /* rule matches, if we have ENV assignments export it */ @@ -1276,7 +1276,7 @@ try_parent: if (temp_value[0] == '\0') { name_list_key_remove(&udev->env_list, key_name); unsetenv(key_name); - info("unset ENV '%s'", key_name); + info("unset ENV '%s'\n", key_name); } else { struct name_entry *entry; @@ -1284,7 +1284,7 @@ try_parent: if (entry == NULL) break; putenv(entry->name); - info("set ENV '%s'", entry->name); + info("set ENV '%s'\n", entry->name); } } } @@ -1321,15 +1321,15 @@ try_parent: strlcpy(value, key_val(rule, &pair->key), sizeof(value)); udev_rules_apply_format(udev, value, sizeof(value)); - info("writing '%s' to sysfs file '%s'", value, attr); + info("writing '%s' to sysfs file '%s'\n", value, attr); f = fopen(attr, "w"); if (f != NULL) { if (!udev->test_run) if (fprintf(f, "%s", value) <= 0) - err("error writing ATTR{%s}: %s", attr, strerror(errno)); + err("error writing ATTR{%s}: %s\n", attr, strerror(errno)); fclose(f); } else - err("error opening ATTR{%s} for writing: %s", attr, strerror(errno)); + err("error opening ATTR{%s} for writing: %s\n", attr, strerror(errno)); } } return 0; @@ -1343,8 +1343,8 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) struct udev_rule *rule; int name_set = 0; - dbg("udev->dev->devpath='%s'", udev->dev->devpath); - dbg("udev->dev->kernel='%s'", udev->dev->kernel); + dbg("udev->dev->devpath='%s'\n", udev->dev->devpath); + dbg("udev->dev->kernel='%s'\n", udev->dev->kernel); /* look for a matching rule to apply */ udev_rules_iter_init(rules); @@ -1357,31 +1357,31 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) (rule->name.operation == KEY_OP_ASSIGN || rule->name.operation == KEY_OP_ASSIGN_FINAL || rule->name.operation == KEY_OP_ADD)) { - dbg("node name already set, rule ignored"); + dbg("node name already set, rule ignored\n"); continue; } - dbg("process rule"); + dbg("process rule\n"); if (match_rule(udev, rule) == 0) { /* apply options */ if (rule->ignore_device) { - info("rule applied, '%s' is ignored", udev->dev->kernel); + info("rule applied, '%s' is ignored\n", udev->dev->kernel); udev->ignore_device = 1; return 0; } if (rule->ignore_remove) { udev->ignore_remove = 1; - dbg("remove event should be ignored"); + dbg("remove event should be ignored\n"); } if (rule->link_priority != 0) { udev->link_priority = rule->link_priority; - info("link_priority=%i", udev->link_priority); + info("link_priority=%i\n", udev->link_priority); } /* apply all_partitions option only at a main block device */ if (rule->partitions && strcmp(udev->dev->subsystem, "block") == 0 && udev->dev->kernel_number[0] == '\0') { udev->partitions = rule->partitions; - dbg("creation of partition nodes requested"); + dbg("creation of partition nodes requested\n"); } /* apply permissions */ @@ -1389,21 +1389,21 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) if (rule->mode.operation == KEY_OP_ASSIGN_FINAL) udev->mode_final = 1; udev->mode = strtol(key_val(rule, &rule->mode), NULL, 8); - dbg("applied mode=%#o to '%s'", udev->mode, udev->dev->kernel); + dbg("applied mode=%#o to '%s'\n", udev->mode, udev->dev->kernel); } if (!udev->owner_final && rule->owner.operation != KEY_OP_UNSET) { if (rule->owner.operation == KEY_OP_ASSIGN_FINAL) udev->owner_final = 1; strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner)); udev_rules_apply_format(udev, udev->owner, sizeof(udev->owner)); - dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel); + dbg("applied owner='%s' to '%s'\n", udev->owner, udev->dev->kernel); } if (!udev->group_final && rule->group.operation != KEY_OP_UNSET) { if (rule->group.operation == KEY_OP_ASSIGN_FINAL) udev->group_final = 1; strlcpy(udev->group, key_val(rule, &rule->group), sizeof(udev->group)); udev_rules_apply_format(udev, udev->group, sizeof(udev->group)); - dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel); + dbg("applied group='%s' to '%s'\n", udev->group, udev->dev->kernel); } /* collect symlinks */ @@ -1419,7 +1419,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) udev->symlink_final = 1; if (rule->symlink.operation == KEY_OP_ASSIGN || rule->symlink.operation == KEY_OP_ASSIGN_FINAL) { - info("reset symlink list"); + info("reset symlink list\n"); name_list_cleanup(&udev->symlink_list); } /* allow multiple symlinks separated by spaces */ @@ -1429,16 +1429,16 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) rule->string_escape == ESCAPE_REPLACE) { count = replace_chars(temp, ALLOWED_CHARS_FILE " "); if (count > 0) - info("%i character(s) replaced" , count); + info("%i character(s) replaced\n" , count); } - dbg("rule applied, added symlink(s) '%s'", temp); + dbg("rule applied, added symlink(s) '%s'\n", temp); pos = temp; while (isspace(pos[0])) pos++; next = strchr(pos, ' '); while (next) { next[0] = '\0'; - info("add symlink '%s'", pos); + info("add symlink '%s'\n", pos); name_list_add(&udev->symlink_list, pos, 0); while (isspace(next[1])) next++; @@ -1446,7 +1446,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) next = strchr(pos, ' '); } if (pos[0] != '\0') { - info("add symlink '%s'", pos); + info("add symlink '%s'\n", pos); name_list_add(&udev->symlink_list, pos, 0); } } @@ -1464,12 +1464,12 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) rule->string_escape == ESCAPE_REPLACE) { count = replace_chars(udev->name, ALLOWED_CHARS_FILE); if (count > 0) - info("%i character(s) replaced", count); + info("%i character(s) replaced\n", count); } - info("rule applied, '%s' becomes '%s'", udev->dev->kernel, udev->name); + info("rule applied, '%s' becomes '%s'\n", udev->dev->kernel, udev->name); if (strcmp(udev->dev->subsystem, "net") != 0) - dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i", + dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i\n", udev->name, udev->owner, udev->group, udev->mode, udev->partitions); } @@ -1479,34 +1479,34 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev) if (rule->run.operation == KEY_OP_ASSIGN_FINAL) udev->run_final = 1; if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) { - info("reset run list"); + info("reset run list\n"); name_list_cleanup(&udev->run_list); } - dbg("add run '%s'", key_val(rule, &rule->run)); + dbg("add run '%s'\n", key_val(rule, &rule->run)); entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0); if (rule->run_ignore_error) entry->ignore_error = 1; } if (rule->last_rule) { - dbg("last rule to be applied"); + dbg("last rule to be applied\n"); break; } if (rule->goto_label.operation != KEY_OP_UNSET) { - dbg("moving forward to label '%s'", key_val(rule, &rule->goto_label)); + dbg("moving forward to label '%s'\n", key_val(rule, &rule->goto_label)); udev_rules_iter_label(rules, key_val(rule, &rule->goto_label)); } } } if (!name_set) { - info("no node name set, will use kernel name '%s'", udev->dev->kernel); + info("no node name set, will use kernel name '%s'\n", udev->dev->kernel); strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name)); } if (udev->tmp_node[0] != '\0') { - dbg("removing temporary device node"); + dbg("removing temporary device node\n"); unlink_secure(udev->tmp_node); udev->tmp_node[0] = '\0'; } @@ -1518,7 +1518,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev) { struct udev_rule *rule; - dbg("udev->kernel='%s'", udev->dev->kernel); + dbg("udev->kernel='%s'\n", udev->dev->kernel); /* look for a matching rule to apply */ udev_rules_iter_init(rules); @@ -1527,7 +1527,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev) if (rule == NULL) break; - dbg("process rule"); + dbg("process rule\n"); if (rule->name.operation == KEY_OP_ASSIGN || rule->name.operation == KEY_OP_ASSIGN_FINAL || rule->name.operation == KEY_OP_ADD || @@ -1536,19 +1536,19 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev) rule->symlink.operation == KEY_OP_ADD || rule->mode.operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) { - dbg("skip rule that names a device"); + dbg("skip rule that names a device\n"); continue; } if (match_rule(udev, rule) == 0) { if (rule->ignore_device) { - info("rule applied, '%s' is ignored", udev->dev->kernel); + info("rule applied, '%s' is ignored\n", udev->dev->kernel); udev->ignore_device = 1; return 0; } if (rule->ignore_remove) { udev->ignore_remove = 1; - dbg("remove event should be ignored"); + dbg("remove event should be ignored\n"); } if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) { @@ -1556,10 +1556,10 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev) if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) { - info("reset run list"); + info("reset run list\n"); name_list_cleanup(&udev->run_list); } - dbg("add run '%s'", key_val(rule, &rule->run)); + dbg("add run '%s'\n", key_val(rule, &rule->run)); entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0); if (rule->run_ignore_error) entry->ignore_error = 1; @@ -1568,12 +1568,12 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev) } if (rule->last_rule) { - dbg("last rule to be applied"); + dbg("last rule to be applied\n"); break; } if (rule->goto_label.operation != KEY_OP_UNSET) { - dbg("moving forward to label '%s'", key_val(rule, &rule->goto_label)); + dbg("moving forward to label '%s'\n", key_val(rule, &rule->goto_label)); udev_rules_iter_label(rules, key_val(rule, &rule->goto_label)); } }