add "root" == 0 shortcuts to lookup_user/group()

[elogind.git] / udev / udev-util.c

diff --git a/udev/udev-util.c b/udev/udev-util.c
index d17a151966d6aeded44865a3638f6c1c983edbc2..76445bbcdcc234bc2adb9668cfa1385b01a9b16a 100644 (file)
--- a/udev/udev-util.c
+++ b/udev/udev-util.c
@@ -29,7 +29,7 @@
 
 #include "udev.h"
 
-int create_path(struct udev *udev, const char *path)
+int util_create_path(struct udev *udev, const char *path)
 {
        char p[UTIL_PATH_SIZE];
        char *pos;
@@ -49,7 +49,7 @@ int create_path(struct udev *udev, const char *path)
        if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
                return 0;
 
-       if (create_path(udev, p) != 0)
+       if (util_create_path(udev, p) != 0)
                return -1;
 
        dbg(udev, "mkdir '%s'\n", p);
@@ -65,7 +65,7 @@ int create_path(struct udev *udev, const char *path)
        return -1;
 }
 
-int delete_path(struct udev *udev, const char *path)
+int util_delete_path(struct udev *udev, const char *path)
 {
        char p[UTIL_PATH_SIZE];
        char *pos;
@@ -102,7 +102,7 @@ int 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.
  */
-int unlink_secure(struct udev *udev, const char *filename)
+int util_unlink_secure(struct udev *udev, const char *filename)
 {
        int retval;
 
@@ -124,11 +124,13 @@ int unlink_secure(struct udev *udev, const char *filename)
        return retval;
 }
 
-uid_t lookup_user(struct udev *udev, const char *user)
+uid_t util_lookup_user(struct udev *udev, const char *user)
 {
        struct passwd *pw;
        uid_t uid = 0;
 
+       if (strcmp(user, "root") == 0)
+               return 0;
        errno = 0;
        pw = getpwnam(user);
        if (pw == NULL) {
@@ -138,15 +140,16 @@ uid_t lookup_user(struct udev *udev, const char *user)
                        err(udev, "error resolving user '%s': %m\n", user);
        } else
                uid = pw->pw_uid;
-
        return uid;
 }
 
-extern gid_t lookup_group(struct udev *udev, const char *group)
+extern gid_t util_lookup_group(struct udev *udev, const char *group)
 {
        struct group *gr;
        gid_t gid = 0;
 
+       if (strcmp(group, "root") == 0)
+               return 0;
        errno = 0;
        gr = getgrnam(group);
        if (gr == NULL) {
@@ -156,12 +159,11 @@ extern gid_t lookup_group(struct udev *udev, const char *group)
                        err(udev, "error resolving group '%s': %m\n", group);
        } else
                gid = gr->gr_gid;
-
        return gid;
 }
 
-int run_program(struct udev *udev, const char *command, char **envp,
-                      char *result, size_t ressize, size_t *reslen)
+int util_run_program(struct udev *udev, const char *command, char **envp,
+                    char *result, size_t ressize, size_t *reslen)
 {
        int status;
        int outpipe[2] = {-1, -1};