(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

3 files changed, 18 insertions, 55 deletions

diff --git a/grp/initgroups.c b/grp/initgroups.c
index 2e489463df..d052cf48f7 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989,91,93,1996-2005,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1989,91,93,1996-2003, 2004  Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +17,6 @@
    02111-1307 USA.  */
 
 #include <alloca.h>
-#include <assert.h>
 #include <errno.h>
 #include <grp.h>
 #include <limits.h>
@@ -74,8 +73,6 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
   /* Start is one, because we have the first group as parameter.  */
   long int start = 1;
 
-  /* Never store more than the starting *SIZE number of elements.  */
-  assert (*size > 0);
   (*groupsp)[0] = group;
 
   if (__nss_group_database != NULL)
@@ -143,9 +140,11 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
 int
 getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups)
 {
+  gid_t *newgroups;
   long int size = MAX (1, *ngroups);
+  int result;
 
-  gid_t *newgroups = (gid_t *) malloc (size * sizeof (gid_t));
+  newgroups = (gid_t *) malloc ((size + 1) * sizeof (gid_t));
   if (__builtin_expect (newgroups == NULL, 0))
     /* No more memory.  */
     // XXX This is wrong.  The user provided memory, we have to use
@@ -154,16 +153,20 @@ getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups)
     // XXX too small.  For initgroups a flag could say: increase size.
     return -1;
 
-  int total = internal_getgrouplist (user, group, &size, &newgroups, -1);
-
-  memcpy (groups, newgroups, MIN (*ngroups, total) * sizeof (gid_t));
+  result = internal_getgrouplist (user, group, &size, &newgroups, -1);
 
-  free (newgroups);
+  memcpy (groups, newgroups, MIN (*ngroups, result) * sizeof (gid_t));
 
-  int retval = total > *ngroups ? -1 : total;
-  *ngroups = total;
+  if (result > *ngroups)
+    {
+      *ngroups = result;
+      result = -1;
+    }
+  else
+    *ngroups = result;
 
-  return retval;
+  free (newgroups);
+  return result;
 }
 
 static_link_warning (getgrouplist)
diff --git a/grp/putgrent.c b/grp/putgrent.c
index 382d6a4daa..cb9b6b1f79 100644
--- a/grp/putgrent.c
+++ b/grp/putgrent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,96,98,99,2000,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 96, 98, 99, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -44,13 +44,8 @@ putgrent (gr, stream)
 
   flockfile (stream);
 
-  if (gr->gr_name[0] == '+' || gr->gr_name[0] == '-')
-    retval = fprintf (stream, "%s:%s::",
-		      gr->gr_name, _S (gr->gr_passwd));
-  else
-    retval = fprintf (stream, "%s:%s:%lu:",
-		      gr->gr_name, _S (gr->gr_passwd),
-		      (unsigned long int) gr->gr_gid);
+  retval = fprintf (stream, "%s:%s:%u:",
+		    gr->gr_name, _S (gr->gr_passwd), gr->gr_gid);
   if (__builtin_expect (retval, 0) < 0)
     {
       funlockfile (stream);
diff --git a/grp/setgroups.c b/grp/setgroups.c
deleted file mode 100644
index 74bae72974..0000000000
--- a/grp/setgroups.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 1991,95,96,97,2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <grp.h>
-
-/* Set the group set for the current user to GROUPS (N of them).  */
-int
-setgroups (n, groups)
-     size_t n;
-     const gid_t *groups;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-libc_hidden_def (setgroups)
-
-stub_warning (setgroups)
-#include <stub-tag.h>