{
char p[UTIL_PATH_SIZE];
char *pos;
- int retval;
+ int err = 0;
if (path[0] == '/')
while(path[1] == '/')
if (pos == p || pos == NULL)
return 0;
- while (1) {
+ for (;;) {
*pos = '\0';
pos = strrchr(p, '/');
if ((pos == p) || (pos == NULL))
break;
- /* remove if empty */
- retval = rmdir(p);
- if (errno == ENOENT)
- retval = 0;
- if (retval) {
- if (errno == ENOTEMPTY)
- return 0;
- err(udev, "rmdir(%s) failed: %m\n", p);
+ err = rmdir(p);
+ if (err < 0) {
+ if (errno == ENOENT)
+ err = 0;
break;
}
- dbg(udev, "removed '%s'\n", p);
}
- return 0;
+ return err;
}
/* Reset permissions on the device node, before unlinking it to make sure,
{
int err;
- chmod(filename, 0000);
chown(filename, 0, 0);
+ chmod(filename, 0000);
err = unlink(filename);
if (errno == ENOENT)
err = 0;
int util_run_program(struct udev *udev, const char *command, char **envp,
char *result, size_t ressize, size_t *reslen,
- const sigset_t *sigmask)
+ const sigset_t *sigmask, bool reset_prio)
{
int status;
int outpipe[2] = {-1, -1};
if (sigmask)
sigprocmask(SIG_SETMASK, sigmask, NULL);
+ if (reset_prio)
+ setpriority(PRIO_PROCESS, 0, 0);
execve(argv[0], argv, envp);
if (errno == ENOENT || errno == ENOTDIR) {
if (errpipe[READ_END] > 0)
close(errpipe[READ_END]);
- /* return the childs stdout string */
+ /* return the child's stdout string */
if (result) {
result[respos] = '\0';
dbg(udev, "result='%s'\n", result);