Fixes so "make allnoconfig" works again.

[oweals/busybox.git] / libbb / my_getgrgid.c

diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c
index 27b67192210f5b9f31b2d81aeb39446a720b99a8..9ac14a34e81867286e4c1d154fbf802f560ff26d 100644 (file)
--- a/libbb/my_getgrgid.c
+++ b/libbb/my_getgrgid.c
@@ -2,7 +2,7 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * 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
@@ -19,23 +19,31 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <stdio.h>
-#include <string.h>
-#include "pwd.h"
-#include "grp.h"
+  /* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more
+  * flexible :
+  *
+  * if bufsize is > 0 char *group cannot be set to NULL.
+  *                   On success groupname is written on static allocated buffer group
+  *                   (and a pointer to it is returned).
+  *                   On failure gid as string is written to static allocated buffer 
+  *                   group and NULL is returned.
+  * if bufsize is = 0 char *group can be set to NULL.
+  *                   On success groupname is returned. 
+  *                   On failure NULL is returned.
+  * if bufsize is < 0 char *group can be set to NULL.
+  *                   On success groupname is returned.
+  *                   On failure an error message is printed and the program exits.   
+  */
+  
 #include "libbb.h"
-
+#include "grp_.h"
 
 /* gets a groupname given a gid */
-void my_getgrgid(char *group, long gid)
+char * my_getgrgid(char *group, long gid, int bufsize)
 {
-       struct group *mygroup;
+       struct group *mygroup = getgrgid(gid);
 
-       mygroup  = getgrgid(gid);
-       if (mygroup==NULL)
-               sprintf(group, "%-8ld ", (long)gid);
-       else
-               strcpy(group, mygroup->gr_name);
+       return  my_getug(group, (mygroup) ? mygroup->gr_name : (char *)mygroup, gid, bufsize, 'g');
 }