X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=5b3e337643d13a0c1cdaf38f9bb39a76a18a153f;hp=811db9cf39447cf591120fa33aa0094acd27998e;hb=79ef2e97d96ca0dbb9a06fa410f126ccfe638841;hpb=6133f3432fe86bc140cc9ba74794826f75c915fa diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c index 811db9cf3..5b3e33764 100644 --- a/libudev/libudev-util-private.c +++ b/libudev/libudev-util-private.c @@ -1,7 +1,7 @@ /* * libudev - interface to udev device information * - * Copyright (C) 2004-2009 Kay Sievers + * Copyright (C) 2003-2009 Kay Sievers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,7 @@ #include #include #include +#include #include "libudev.h" #include "libudev-private.h" @@ -29,35 +30,44 @@ int util_create_path(struct udev *udev, const char *path) char p[UTIL_PATH_SIZE]; char *pos; struct stat stats; - int ret; + int err; util_strscpy(p, sizeof(p), path); pos = strrchr(p, '/'); - if (pos == p || pos == NULL) + if (pos == NULL) return 0; - - while (pos[-1] == '/') + while (pos != p && pos[-1] == '/') pos--; + if (pos == p) + return 0; 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); - ret = mkdir(p, 0755); + err = mkdir(p, 0755); + 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); - if (ret == 0) - return 0; - - if (errno == EEXIST) - if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR) - return 0; - return -1; + return err; } int util_delete_path(struct udev *udev, const char *path) @@ -66,7 +76,10 @@ int util_delete_path(struct udev *udev, const char *path) char *pos; int retval; - strcpy (p, path); + if (path[0] == '/') + while(path[1] == '/') + path++; + util_strscpy(p, sizeof(p), path); pos = strrchr(p, '/'); if (pos == p || pos == NULL) return 0; @@ -95,28 +108,20 @@ int util_delete_path(struct udev *udev, const char *path) } /* Reset permissions on the device node, before unlinking it to make sure, - * that permisions of possible hard links will be removed too. + * that permissions of possible hard links will be removed too. */ int util_unlink_secure(struct udev *udev, const char *filename) { - int retval; + int err; - retval = chown(filename, 0, 0); - if (retval) - err(udev, "chown(%s, 0, 0) failed: %m\n", filename); - - retval = chmod(filename, 0000); - if (retval) - err(udev, "chmod(%s, 0000) failed: %m\n", filename); - - retval = unlink(filename); + chmod(filename, 0000); + chown(filename, 0, 0); + err = unlink(filename); if (errno == ENOENT) - retval = 0; - - if (retval) + err = 0; + if (err) err(udev, "unlink(%s) failed: %m\n", filename); - - return retval; + return err; } uid_t util_lookup_user(struct udev *udev, const char *user) @@ -134,8 +139,7 @@ uid_t util_lookup_user(struct udev *udev, const char *user) if (endptr[0] == '\0') return uid; - errno = 0; - getpwnam_r(user, &pwbuf, buf, buflen, &pw); + errno = getpwnam_r(user, &pwbuf, buf, buflen, &pw); if (pw != NULL) return pw->pw_uid; if (errno == 0 || errno == ENOENT || errno == ESRCH) @@ -149,7 +153,7 @@ gid_t util_lookup_group(struct udev *udev, const char *group) { char *endptr; int buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - char buf[buflen]; + char *buf; struct group grbuf; struct group *gr; gid_t gid = 0; @@ -159,16 +163,30 @@ gid_t util_lookup_group(struct udev *udev, const char *group) gid = strtoul(group, &endptr, 10); if (endptr[0] == '\0') return gid; + buf = NULL; + gid = 0; + for (;;) { + char *newbuf; - errno = 0; - getgrnam_r(group, &grbuf, buf, buflen, &gr); - if (gr != NULL) - return gr->gr_gid; - if (errno == 0 || errno == ENOENT || errno == ESRCH) - err(udev, "specified group '%s' unknown\n", group); - else - err(udev, "error resolving group '%s': %m\n", group); - return 0; + newbuf = realloc(buf, buflen); + if (!newbuf) + break; + buf = newbuf; + errno = getgrnam_r(group, &grbuf, buf, buflen, &gr); + if (gr != NULL) { + gid = gr->gr_gid; + } else if (errno == ERANGE) { + buflen *= 2; + continue; + } else if (errno == 0 || errno == ENOENT || errno == ESRCH) { + err(udev, "specified group '%s' unknown\n", group); + } else { + err(udev, "error resolving group '%s': %m\n", group); + } + break; + } + free(buf); + return gid; } /* handle "[/]" format */ @@ -235,7 +253,8 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string, } 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) { int status; int outpipe[2] = {-1, -1}; @@ -243,11 +262,13 @@ 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]; - char *argv[(sizeof(arg) / 2) + 1]; + char *argv[((sizeof(arg) + 1) / 2) + 1]; int devnull; int i; int err = 0; + info(udev, "'%s' started\n", command); + /* build argv from command */ util_strscpy(arg, sizeof(arg), command); i = 0; @@ -259,10 +280,14 @@ int util_run_program(struct udev *udev, const char *command, char **envp, /* 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, " "); + if (pos != NULL) + while (pos[0] == ' ') + pos++; } dbg(udev, "arg[%i] '%s'\n", i, argv[i]); i++; @@ -272,7 +297,6 @@ int util_run_program(struct udev *udev, const char *command, char **envp, argv[0] = arg; argv[1] = NULL; } - info(udev, "'%s'\n", command); /* prepare pipes from child to parent */ if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) { @@ -322,9 +346,13 @@ int util_run_program(struct udev *udev, const char *command, char **envp, dup2(errpipe[WRITE_END], STDERR_FILENO); close(errpipe[WRITE_END]); } + + if (sigmask) + sigprocmask(SIG_SETMASK, sigmask, NULL); + execve(argv[0], argv, envp); if (errno == ENOENT || errno == ENOTDIR) { - /* may be on a filesytem which is not mounted right now */ + /* may be on a filesystem which is not mounted right now */ info(udev, "program '%s' not found\n", argv[0]); } else { /* other problems */ @@ -356,7 +384,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp, FD_SET(outpipe[READ_END], &readfds); if (errpipe[READ_END] > 0) FD_SET(errpipe[READ_END], &readfds); - fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL); + fdcount = select(MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL); if (fdcount < 0) { if (errno == EINTR) continue; @@ -434,11 +462,11 @@ int util_run_program(struct udev *udev, const char *command, char **envp, } waitpid(pid, &status, 0); if (WIFEXITED(status)) { - info(udev, "'%s' returned with status %i\n", argv[0], WEXITSTATUS(status)); + info(udev, "'%s' returned with exitcode %i\n", command, WEXITSTATUS(status)); if (WEXITSTATUS(status) != 0) err = -1; } else { - err(udev, "'%s' abnormal exit\n", command); + err(udev, "'%s' unexpected exit with status 0x%04x\n", command, status); err = -1; } }