/* prepare pipes from child to parent */
if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) {
if (pipe(outpipe) != 0) {
- err(udev, "pipe failed: %s\n", strerror(errno));
+ err(udev, "pipe failed: %m\n");
return -1;
}
}
if (udev_get_log_priority(udev) >= LOG_INFO) {
if (pipe(errpipe) != 0) {
- err(udev, "pipe failed: %s\n", strerror(errno));
+ err(udev, "pipe failed: %m\n");
return -1;
}
}
dup2(devnull, STDERR_FILENO);
close(devnull);
} else
- err(udev, "open /dev/null failed: %s\n", strerror(errno));
+ err(udev, "open /dev/null failed: %m\n");
if (outpipe[WRITE_END] > 0) {
dup2(outpipe[WRITE_END], STDOUT_FILENO);
close(outpipe[WRITE_END]);
}
_exit(1);
case -1:
- err(udev, "fork of '%s' failed: %s\n", argv[0], strerror(errno));
+ err(udev, "fork of '%s' failed: %m\n", argv[0]);
return -1;
default:
/* read from child if requested */
close(outpipe[READ_END]);
outpipe[READ_END] = -1;
if (count < 0) {
- err(udev, "stdin read failed: %s\n", strerror(errno));
+ err(udev, "stdin read failed: %m\n");
retval = -1;
}
continue;
close(errpipe[READ_END]);
errpipe[READ_END] = -1;
if (count < 0)
- err(udev, "stderr read failed: %s\n", strerror(errno));
+ err(udev, "stderr read failed: %m\n");
continue;
}
errbuf[count] = '\0';
size_t bufsize;
if (file_map(filename, &buf, &bufsize) != 0) {
- err(udevice->udev, "can't open '%s': %s\n", filename, strerror(errno));
+ err(udevice->udev, "can't open '%s': %m\n", filename);
return -1;
}
import_keys_into_env(udevice, buf, bufsize);
if (f != NULL) {
if (!udevice->test_run)
if (fprintf(f, "%s", value) <= 0)
- err(udevice->udev, "error writing ATTR{%s}: %s\n", attr, strerror(errno));
+ err(udevice->udev, "error writing ATTR{%s}: %m\n", attr);
fclose(f);
} else
- err(udevice->udev, "error opening ATTR{%s} for writing: %s\n", attr, strerror(errno));
+ err(udevice->udev, "error opening ATTR{%s} for writing: %m\n", attr);
}
}
return 0;
rule->symlink.operation == KEY_OP_ADD)) {
char temp[UTIL_PATH_SIZE];
char *pos, *next;
- int count;
+ int count = 0;
if (rule->symlink.operation == KEY_OP_ASSIGN_FINAL)
udevice->symlink_final = 1;
/* allow multiple symlinks separated by spaces */
util_strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
udev_rules_apply_format(udevice, temp, sizeof(temp));
- if (rule->string_escape == ESCAPE_UNSET ||
- rule->string_escape == ESCAPE_REPLACE) {
+ if (rule->string_escape == ESCAPE_UNSET)
count = util_replace_chars(temp, ALLOWED_CHARS_FILE " ");
- if (count > 0)
- info(udevice->udev, "%i character(s) replaced\n" , count);
- }
+ else if (rule->string_escape == ESCAPE_REPLACE)
+ count = util_replace_chars(temp, ALLOWED_CHARS_FILE);
+ if (count > 0)
+ info(udevice->udev, "%i character(s) replaced\n" , count);
dbg(udevice->udev, "rule applied, added symlink(s) '%s'\n", temp);
pos = temp;
while (isspace(pos[0]))