chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trivial cleanups
[elogind.git]
/
libudev
/
libudev-util-private.c
diff --git
a/libudev/libudev-util-private.c
b/libudev/libudev-util-private.c
index c86567159eaf98a5886b67371bb1cb152bf98419..073f7e2df8fa1b54d28f079ba48b89e3e98232b3 100644
(file)
--- a/
libudev/libudev-util-private.c
+++ b/
libudev/libudev-util-private.c
@@
-25,7
+25,7
@@
#include "libudev.h"
#include "libudev-private.h"
#include "libudev.h"
#include "libudev-private.h"
-
int util_create_path(struct udev *udev, const char *path
)
+
static int create_path(struct udev *udev, const char *path, bool selinux
)
{
char p[UTIL_PATH_SIZE];
char *pos;
{
char p[UTIL_PATH_SIZE];
char *pos;
@@
-34,42
+34,69
@@
int util_create_path(struct udev *udev, const char *path)
util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
- if (pos ==
p || pos ==
NULL)
+ if (pos == NULL)
return 0;
return 0;
-
- while (pos[-1] == '/')
+ while (pos != p && pos[-1] == '/')
pos--;
pos--;
+ if (pos == p)
+ return 0;
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);
dbg(udev, "mkdir '%s'\n", p);
- udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
+ if (selinux)
+ udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
err = mkdir(p, 0755);
err = mkdir(p, 0755);
- if (err != 0 && errno == EEXIST)
- if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
- err = 0;
- udev_selinux_resetfscreatecon(udev);
+ 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;
+ }
+ }
+ if (selinux)
+ udev_selinux_resetfscreatecon(udev);
return err;
}
return err;
}
+int util_create_path(struct udev *udev, const char *path)
+{
+ return create_path(udev, path, false);
+}
+
+int util_create_path_selinux(struct udev *udev, const char *path)
+{
+ return create_path(udev, path, true);
+}
+
int util_delete_path(struct udev *udev, const char *path)
{
char p[UTIL_PATH_SIZE];
char *pos;
int util_delete_path(struct udev *udev, const char *path)
{
char p[UTIL_PATH_SIZE];
char *pos;
- int
retval
;
+ int
err = 0
;
+ if (path[0] == '/')
+ while(path[1] == '/')
+ path++;
util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
if (pos == p || pos == NULL)
return 0;
util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
if (pos == p || pos == NULL)
return 0;
-
while (1
) {
+
for (;;
) {
*pos = '\0';
pos = strrchr(p, '/');
*pos = '\0';
pos = strrchr(p, '/');
@@
-77,19
+104,14
@@
int util_delete_path(struct udev *udev, const char *path)
if ((pos == p) || (pos == NULL))
break;
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;
}
break;
}
- dbg(udev, "removed '%s'\n", p);
}
}
- return
0
;
+ return
err
;
}
/* Reset permissions on the device node, before unlinking it to make sure,
}
/* Reset permissions on the device node, before unlinking it to make sure,
@@
-99,8
+121,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;
@@
-112,7
+134,7
@@
int util_unlink_secure(struct udev *udev, const char *filename)
uid_t util_lookup_user(struct udev *udev, const char *user)
{
char *endptr;
uid_t util_lookup_user(struct udev *udev, const char *user)
{
char *endptr;
-
in
t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+
size_
t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
char buf[buflen];
struct passwd pwbuf;
struct passwd *pw;
char buf[buflen];
struct passwd pwbuf;
struct passwd *pw;
@@
-137,7
+159,7
@@
uid_t util_lookup_user(struct udev *udev, const char *user)
gid_t util_lookup_group(struct udev *udev, const char *group)
{
char *endptr;
gid_t util_lookup_group(struct udev *udev, const char *group)
{
char *endptr;
-
in
t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+
size_
t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
char *buf;
struct group grbuf;
struct group *gr;
char *buf;
struct group grbuf;
struct group *gr;
@@
-238,7
+260,8
@@
int util_resolve_subsys_kernel(struct udev *udev, const char *string,
}
int util_run_program(struct udev *udev, const char *command, char **envp,
}
int util_run_program(struct udev *udev, const char *command, char **envp,
- char *result, size_t ressize, size_t *reslen)
+ char *result, size_t ressize, size_t *reslen,
+ const sigset_t *sigmask, bool reset_prio)
{
int status;
int outpipe[2] = {-1, -1};
{
int status;
int outpipe[2] = {-1, -1};
@@
-246,7
+269,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;
@@
-264,10
+287,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++;
@@
-326,6
+353,12
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
dup2(errpipe[WRITE_END], STDERR_FILENO);
close(errpipe[WRITE_END]);
}
dup2(errpipe[WRITE_END], STDERR_FILENO);
close(errpipe[WRITE_END]);
}
+
+ 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) {
/* may be on a filesystem which is not mounted right now */
execve(argv[0], argv, envp);
if (errno == ENOENT || errno == ENOTDIR) {
/* may be on a filesystem which is not mounted right now */
@@
-428,7
+461,7
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
if (errpipe[READ_END] > 0)
close(errpipe[READ_END]);
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);
if (result) {
result[respos] = '\0';
dbg(udev, "result='%s'\n", result);