Update.

[glibc.git] / nis / nis_print_group_entry.c

diff --git a/nis/nis_print_group_entry.c b/nis/nis_print_group_entry.c
index fbc9ad11bae7dba80f5f5c5c342a498ef3f9fe46..7f50c85a8e962f2273afc58c1b018038614895ca 100644 (file)
--- a/nis/nis_print_group_entry.c
+++ b/nis/nis_print_group_entry.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Free Software Foundation, Inc.
+/* Copyright (c) 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -17,17 +17,20 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA. */
 
+#include <alloca.h>
 #include <string.h>
+#include <libintl.h>
 #include <rpcsvc/nis.h>
 
 void
 nis_print_group_entry (const_nis_name group)
 {
-  if (group != NULL && strlen (group) > 0)
+  if (group != NULL && group[0] != '\0')
     {
-      char buf[strlen (group) + 50];
-      char leafbuf[strlen (group) + 3];
-      char domainbuf[strlen (group) + 3];
+      size_t grouplen = strlen (group);
+      char buf[grouplen + 50];
+      char leafbuf[grouplen + 3];
+      char domainbuf[grouplen + 3];
       unsigned long mem_exp_cnt = 0, mem_imp_cnt = 0, mem_rec_cnt = 0;
       unsigned long nomem_exp_cnt = 0, nomem_imp_cnt = 0, nomem_rec_cnt = 0;
       char **mem_exp, **mem_imp, **mem_rec;
@@ -39,7 +42,7 @@ nis_print_group_entry (const_nis_name group)
       cp = stpcpy (buf, nis_leaf_of_r (group, leafbuf, sizeof (leafbuf) - 1));
       cp = stpcpy (cp, ".groups_dir");
       cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1);
-      if (cp2 != NULL && strlen (cp2) > 0)
+      if (cp2 != NULL && cp2[0] != '\0')
        {
          *cp++ = '.';
          stpcpy (cp, cp2);
@@ -53,18 +56,18 @@ nis_print_group_entry (const_nis_name group)
          (__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ))
        return;
 
-      mem_exp = malloc (sizeof (char *) * NIS_RES_NUMOBJ (res));
-      mem_imp = malloc (sizeof (char *) * NIS_RES_NUMOBJ (res));
-      mem_rec = malloc (sizeof (char *) * NIS_RES_NUMOBJ (res));
-      nomem_exp = malloc (sizeof (char *) * NIS_RES_NUMOBJ (res));
-      nomem_imp = malloc (sizeof (char *) * NIS_RES_NUMOBJ (res));
-      nomem_rec = malloc (sizeof (char *) * NIS_RES_NUMOBJ (res));
+      mem_exp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res));
+      mem_imp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res));
+      mem_rec = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res));
+      nomem_exp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res));
+      nomem_imp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res));
+      nomem_rec = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res));
 
       for (i = 0;
-        i < NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len; ++i)
+          i < NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len; ++i)
        {
          char *grmem =
-         NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val[i];
+           NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val[i];
          int neg = grmem[0] == '-';
 
          switch (grmem[neg])
@@ -164,12 +167,6 @@ nis_print_group_entry (const_nis_name group)
       else
         fputs (_("    No recursive nonmembers\n"), stdout);
 
-      free (mem_exp);
-      free (mem_imp);
-      free (mem_rec);
-      free (nomem_exp);
-      free (nomem_imp);
-      free (nomem_rec);
       nis_freeresult (res);
     }
 }