chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update NEWS
[elogind.git]
/
libudev
/
libudev-util-private.c
diff --git
a/libudev/libudev-util-private.c
b/libudev/libudev-util-private.c
index dfde5a998d3413109239eb93cf77e0bf006eaed2..c05c157575aa084716afab0f413c147f791bded3 100644
(file)
--- a/
libudev/libudev-util-private.c
+++ b/
libudev/libudev-util-private.c
@@
-43,18
+43,29
@@
int util_create_path(struct udev *udev, const char *path)
pos[0] = '\0';
dbg(udev, "stat '%s'\n", p);
pos[0] = '\0';
dbg(udev, "stat '%s'\n", p);
- if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
- return 0;
+ if (stat(p, &stats) == 0) {
+ if ((stats.st_mode & S_IFMT) == S_IFDIR)
+ return 0;
+ else
+ return -ENOTDIR;
+ }
- if (util_create_path(udev, p) != 0)
- return -1;
+ err = util_create_path(udev, p);
+ if (err != 0)
+ return err;
dbg(udev, "mkdir '%s'\n", p);
udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
err = mkdir(p, 0755);
dbg(udev, "mkdir '%s'\n", p);
udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
err = mkdir(p, 0755);
- if (err != 0 && errno == EEXIST)
- if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
- err = 0;
+ if (err != 0) {
+ err = -errno;
+ if (err == -EEXIST && stat(p, &stats) == 0) {
+ if ((stats.st_mode & S_IFMT) == S_IFDIR)
+ err = 0;
+ else
+ err = -ENOTDIR;
+ }
+ }
udev_selinux_resetfscreatecon(udev);
return err;
}
udev_selinux_resetfscreatecon(udev);
return err;
}
@@
-103,8
+114,8
@@
int util_unlink_secure(struct udev *udev, const char *filename)
{
int err;
{
int err;
- chmod(filename, 0000);
chown(filename, 0, 0);
chown(filename, 0, 0);
+ chmod(filename, 0000);
err = unlink(filename);
if (errno == ENOENT)
err = 0;
err = unlink(filename);
if (errno == ENOENT)
err = 0;
@@
-251,7
+262,7
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
pid_t pid;
char arg[UTIL_PATH_SIZE];
char program[UTIL_PATH_SIZE];
pid_t pid;
char arg[UTIL_PATH_SIZE];
char program[UTIL_PATH_SIZE];
- char *argv[(
sizeof(arg
) / 2) + 1];
+ char *argv[(
(sizeof(arg) + 1
) / 2) + 1];
int devnull;
int i;
int err = 0;
int devnull;
int i;
int err = 0;
@@
-269,10
+280,14
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
/* do not separate quotes */
pos++;
argv[i] = strsep(&pos, "\'");
/* do not separate quotes */
pos++;
argv[i] = strsep(&pos, "\'");
- while (pos != NULL && pos[0] == ' ')
- pos++;
+ if (pos != NULL)
+ while (pos[0] == ' ')
+ pos++;
} else {
argv[i] = strsep(&pos, " ");
} else {
argv[i] = strsep(&pos, " ");
+ if (pos != NULL)
+ while (pos[0] == ' ')
+ pos++;
}
dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
i++;
}
dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
i++;
@@
-333,7
+348,7
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
}
if (sigmask)
}
if (sigmask)
- sigprocmask(SIG_
BLOC
K, sigmask, NULL);
+ sigprocmask(SIG_
SETMAS
K, sigmask, NULL);
execve(argv[0], argv, envp);
if (errno == ENOENT || errno == ENOTDIR) {
execve(argv[0], argv, envp);
if (errno == ENOENT || errno == ENOTDIR) {