Also merge into the top-level Makefile.am the simpler extras.

[elogind.git] / libudev / libudev-util-private.c

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 5f5f4c1d89f82e823c203500fc5cea44fcdc5dd6..00d1c95d52fcd981d2d9a24c15da86cbd75dcd0c 100644 (file)
--- 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 <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -149,8 +149,8 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
 gid_t util_lookup_group(struct udev *udev, const char *group)
 {
        char *endptr;
-       int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-       char buf[buflen];
+       int buflen;
+       char *buf;
        struct group grbuf;
        struct group *gr;
        gid_t gid = 0;
@@ -161,15 +161,31 @@ gid_t util_lookup_group(struct udev *udev, const char *group)
        if (endptr[0] == '\0')
                return gid;
 
-       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;
+       buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+       if (buflen < 0)
+               buflen = 1000;
+       buf = NULL;
+       gid = 0;
+       for (;;) {
+               buf = realloc(buf, buflen);
+               if (!buf)
+                       break;
+               errno = 0;
+               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 "[<SUBSYSTEM>/<KERNEL>]<attribute>" format */
@@ -249,6 +265,8 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
        int i;
        int err = 0;
 
+       info(udev, "'%s' started\n", command);
+
        /* build argv from command */
        util_strscpy(arg, sizeof(arg), command);
        i = 0;
@@ -273,7 +291,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) {