getgroups: avoid calling exit

rpl_getgroups should be a library function, comparable to glibc.

* modules/getgroups (Depends-on): Add malloc-posix and unistd,
drop xalloc.
* modules/getgroups-tests (Depends-on, Makefile.am): Drop unneeded
dependencies.
* lib/getgroups.c (rpl_getgroups): Fail with ENOMEM rather than
exiting, in the rare case of malloc failure.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 099f1ee9da917e386afcd604610ac0662283c6cd..86e3bf83a221e3b2d593fa382b4f801966ddcb05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-11-13  Eric Blake  <ebb9@byu.net>
 
+       getgroups: avoid calling exit
+       * modules/getgroups (Depends-on): Add malloc-posix and unistd,
+       drop xalloc.
+       * modules/getgroups-tests (Depends-on, Makefile.am): Drop unneeded
+       dependencies.
+       * lib/getgroups.c (rpl_getgroups): Fail with ENOMEM rather than
+       exiting, in the rare case of malloc failure.
+
        getgroups: fix logic error
        * lib/getgroups.c (rpl_getgroups): Don't fail if current process
        has more than 20 groups.

diff --git a/lib/getgroups.c b/lib/getgroups.c
index 207a44189843e40f1b7c809157216e1af96dfd97..e764d732fce06f4914dcbdcd5201e4c9d5725970 100644 (file)
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -20,20 +20,19 @@
 
 #include <config.h>
 
-#undef getgroups
+#include <unistd.h>
 
-#include <stdio.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 
-#include "xalloc.h"
+#undef getgroups
 
-/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, 0) always fails.
-   On other systems, it returns the number of supplemental groups for the
-   process.  This function handles that special case and lets the system-
-   provided function handle all others. */
+/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always
+   fails.  On other systems, it returns the number of supplemental
+   groups for the process.  This function handles that special case
+   and lets the system-provided function handle all others.  However,
+   it can fail with ENOMEM if memory is tight.  It is unspecified
+   whether the effective group id is included in the list.  */
 
 int
 rpl_getgroups (int n, GETGROUPS_T *group)
@@ -51,7 +50,9 @@ rpl_getgroups (int n, GETGROUPS_T *group)
       /* No need to worry about address arithmetic overflow here,
          since the ancient systems that we're running on have low
          limits on the number of secondary groups.  */
-      gbuf = xmalloc (n * sizeof *gbuf);
+      gbuf = malloc (n * sizeof *gbuf);
+      if (!gbuf)
+        return -1;
       n_groups = getgroups (n, gbuf);
       if (n_groups == -1 ? errno != EINVAL : n_groups < n)
         break;

diff --git a/modules/getgroups b/modules/getgroups
index 16604f8f3504b507edaf221a9e19f62f7610c4c7..472d20e9ce60eeb408ff00f50da0b206f7558bf5 100644 (file)
--- a/modules/getgroups
+++ b/modules/getgroups
@@ -6,7 +6,8 @@ lib/getgroups.c
 m4/getgroups.m4
 
 Depends-on:
-xalloc
+malloc-posix
+unistd
 
 configure.ac:
 gl_FUNC_GETGROUPS
@@ -20,5 +21,4 @@ License:
 GPL
 
 Maintainer:
-Jim Meyering
-
+Jim Meyering, Eric Blake

diff --git a/modules/getgroups-tests b/modules/getgroups-tests
index f879e494b23beda29f5c5536a10a29f95953fc06..2a526213155b500528dcba9997039ea8712b7204 100644 (file)
--- a/modules/getgroups-tests
+++ b/modules/getgroups-tests
@@ -2,11 +2,9 @@ Files:
 tests/test-getgroups.c
 
 Depends-on:
-progname
 
 configure.ac:
 
 Makefile.am:
 TESTS += test-getgroups
 check_PROGRAMS += test-getgroups
-test_getgroups_LDADD = $(LDADD) @LIBINTL@