From 83b1d6414af952ac03022bf956d84a21f6132d0e Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 27 Apr 2011 16:23:45 -0600 Subject: [PATCH] hash, mgetgroups: drop xalloc dependency Rely on the new xalloc-oversized module to avoid requiring xalloc-die for functions documented as returning NULL on potential allocation overflow. * lib/hash.c (includes): Adjust includes. * lib/mgetgroups.c (includes): Likewise. (xgetgroups): Move... * lib/xgetgroups.c: ...to new file. * modules/xgetgroups: New file, split from... * modules/mgetgroups: ...here. (Depends-on): Add xalloc-oversized. * modules/hash (Depends-on): Likewise. * modules/hash-tests (Depends-on): Drop xalloc. (test_hash_LDADD): Drop unused library. * tests/test-hash.c (main): Break xalloc dependency. (includes): Drop unused include. Signed-off-by: Eric Blake --- ChangeLog | 15 +++++++++++++++ NEWS | 3 +++ lib/hash.c | 2 +- lib/mgetgroups.c | 13 +------------ lib/mgetgroups.h | 2 ++ lib/xgetgroups.c | 37 +++++++++++++++++++++++++++++++++++++ modules/hash | 4 ++-- modules/hash-tests | 2 -- modules/mgetgroups | 2 +- modules/xgetgroups | 25 +++++++++++++++++++++++++ tests/test-hash.c | 14 +++++++++----- 11 files changed, 96 insertions(+), 23 deletions(-) create mode 100644 lib/xgetgroups.c create mode 100644 modules/xgetgroups diff --git a/ChangeLog b/ChangeLog index 039d3c55b..df91f2583 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2011-04-28 Eric Blake + hash, mgetgroups: drop xalloc dependency + * lib/hash.c (includes): Adjust includes. + * lib/mgetgroups.c (includes): Likewise. + (xgetgroups): Move... + * lib/xgetgroups.c: ...to new file. + * lib/mgetgroups.h (xgetgroups): Make declaration conditional. + * modules/xgetgroups: New file, split from... + * modules/mgetgroups: ...here. + (Depends-on): Add xalloc-oversized. + * modules/hash (Depends-on): Likewise. + * modules/hash-tests (Depends-on): Drop xalloc. + (test_hash_LDADD): Drop unused library. + * tests/test-hash.c (main): Break xalloc dependency. + (includes): Drop unused include. + xalloc-oversized: new module * modules/xalloc-oversized: New module. * modules/xalloc (Depends-on): Add it. diff --git a/NEWS b/NEWS index 5081dbaa8..b693a3359 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,9 @@ User visible incompatible changes Date Modules Changes +2011-04-27 mgetgroups The 'xgetgroups' function has been split into + a new 'xgetgroups' module. + 2011-04-27 save-cwd This module pulls in fewer dependencies by default; to retain robust handling of directories with an absolute name longer than PATH_MAX, you diff --git a/lib/hash.c b/lib/hash.c index f3de2aaaa..4d76f765e 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -27,7 +27,7 @@ #include "hash.h" #include "bitrotate.h" -#include "xalloc.h" +#include "xalloc-oversized.h" #include #include diff --git a/lib/mgetgroups.c b/lib/mgetgroups.c index 5c79915bc..e0aa250ca 100644 --- a/lib/mgetgroups.c +++ b/lib/mgetgroups.c @@ -31,7 +31,7 @@ #endif #include "getugroups.h" -#include "xalloc.h" +#include "xalloc-oversized.h" static gid_t * realloc_groupbuf (gid_t *g, size_t num) @@ -193,14 +193,3 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups) return ng; } - -/* Like mgetgroups, but call xalloc_die on allocation failure. */ - -int -xgetgroups (char const *username, gid_t gid, gid_t **groups) -{ - int result = mgetgroups (username, gid, groups); - if (result == -1 && errno == ENOMEM) - xalloc_die (); - return result; -} diff --git a/lib/mgetgroups.h b/lib/mgetgroups.h index a1fd040e7..7a572bc2f 100644 --- a/lib/mgetgroups.h +++ b/lib/mgetgroups.h @@ -17,4 +17,6 @@ #include int mgetgroups (const char *username, gid_t gid, gid_t **groups); +#if GNULIB_XGETGROUPS int xgetgroups (const char *username, gid_t gid, gid_t **groups); +#endif diff --git a/lib/xgetgroups.c b/lib/xgetgroups.c new file mode 100644 index 000000000..41886c912 --- /dev/null +++ b/lib/xgetgroups.c @@ -0,0 +1,37 @@ +/* xgetgroups.c -- return a list of the groups a user or current process is in + + Copyright (C) 2007-2011 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Extracted from coreutils' src/id.c. */ + +#include + +#include "mgetgroups.h" + +#include + +#include "xalloc.h" + +/* Like mgetgroups, but call xalloc_die on allocation failure. */ + +int +xgetgroups (char const *username, gid_t gid, gid_t **groups) +{ + int result = mgetgroups (username, gid, groups); + if (result == -1 && errno == ENOMEM) + xalloc_die (); + return result; +} diff --git a/modules/hash b/modules/hash index 75a99da37..72afda6cf 100644 --- a/modules/hash +++ b/modules/hash @@ -1,5 +1,5 @@ Description: -Parametrizable hash table. +Parameterizable hash table. Files: lib/hash.c @@ -10,7 +10,7 @@ Depends-on: bitrotate stdbool stdint -xalloc +xalloc-oversized configure.ac: gl_HASH diff --git a/modules/hash-tests b/modules/hash-tests index a77bfe7d6..b3f814b6e 100644 --- a/modules/hash-tests +++ b/modules/hash-tests @@ -7,11 +7,9 @@ hash-pjw inttostr progname stdbool -xalloc configure.ac: Makefile.am: TESTS += test-hash check_PROGRAMS += test-hash -test_hash_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/mgetgroups b/modules/mgetgroups index c404d0143..1aa1c79ae 100644 --- a/modules/mgetgroups +++ b/modules/mgetgroups @@ -10,7 +10,7 @@ Depends-on: getgroups getugroups realloc-gnu -xalloc +xalloc-oversized configure.ac: gl_MGETGROUPS diff --git a/modules/xgetgroups b/modules/xgetgroups new file mode 100644 index 000000000..6ae361434 --- /dev/null +++ b/modules/xgetgroups @@ -0,0 +1,25 @@ +Description: +Return the group IDs of a user or current process in malloc'd storage, with +out-of-memory checking. + +Files: +lib/xgetgroups.c + +Depends-on: +mgetgroups +xalloc + +configure.ac: +gl_MODULE_INDICATOR([xgetgroups]) + +Makefile.am: +lib_SOURCES += xgetgroups.c + +Include: +"mgetgroups.h" + +License: +GPL + +Maintainer: +Jim Meyering, Eric Blake diff --git a/tests/test-hash.c b/tests/test-hash.c index 108daefdf..ecfe357cc 100644 --- a/tests/test-hash.c +++ b/tests/test-hash.c @@ -20,7 +20,6 @@ #include "hash.h" #include "hash-pjw.h" #include "inttostr.h" -#include "xalloc.h" #include #include @@ -114,8 +113,10 @@ main (int argc, char **argv) ASSERT (ht); insert_new (ht, "a"); { - char *str1 = xstrdup ("a"); - char *str2 = hash_insert (ht, str1); + char *str1 = strdup ("a"); + char *str2; + ASSERT (str1); + str2 = hash_insert (ht, str1); ASSERT (str1 != str2); ASSERT (STREQ (str1, str2)); free (str1); @@ -161,7 +162,8 @@ main (int argc, char **argv) ht = hash_initialize (sz, NULL, NULL, NULL, NULL); ASSERT (ht); { - char *str = xstrdup ("a"); + char *str = strdup ("a"); + ASSERT (str); insert_new (ht, "a"); insert_new (ht, str); ASSERT (hash_lookup (ht, str) == str); @@ -206,7 +208,9 @@ main (int argc, char **argv) { char buf[50]; char const *p = uinttostr (i, buf); - insert_new (ht, xstrdup (p)); + char *dup = strdup (p); + ASSERT (dup); + insert_new (ht, dup); } break; -- 2.11.0