summaryrefslogtreecommitdiff
path: root/libbb/bb_pwd.c
diff options
context:
space:
mode:
authorDenis Vlasenko2006-10-05 10:17:08 +0000
committerDenis Vlasenko2006-10-05 10:17:08 +0000
commit7d219aab70e6951ab82c27c202cac05016696723 (patch)
tree4c0679bfa391f71aee9b51505a5d3dc8f60a0cf7 /libbb/bb_pwd.c
parent8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (diff)
downloadbusybox-7d219aab70e6951ab82c27c202cac05016696723.zip
busybox-7d219aab70e6951ab82c27c202cac05016696723.tar.gz
build system overhaul
Diffstat (limited to 'libbb/bb_pwd.c')
-rw-r--r--libbb/bb_pwd.c46
1 files changed, 4 insertions, 42 deletions
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index e4d3273..3a214ca 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -7,8 +7,11 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "libbb.h"
-#ifdef L_bb_getgrgid
/* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more
* flexible :
*
@@ -26,9 +29,6 @@
* the program exits.
*/
-#include "libbb.h"
-#include "grp_.h"
-
/* gets a groupname given a gid */
char * bb_getgrgid(char *group, long gid, int bufsize)
{
@@ -37,15 +37,6 @@ char * bb_getgrgid(char *group, long gid, int bufsize)
return bb_getug(group, (mygroup) ?
mygroup->gr_name : (char *)mygroup, gid, bufsize, 'g');
}
-#endif /* L_bb_getgrgid */
-
-#ifdef L_bb_xgetgrnam
-#include <stdio.h>
-#include <string.h>
-#include "libbb.h"
-#include "pwd_.h"
-#include "grp_.h"
-
/* returns a gid given a group name */
long bb_xgetgrnam(const char *name)
@@ -58,15 +49,6 @@ long bb_xgetgrnam(const char *name)
return (mygroup->gr_gid);
}
-#endif /* L_bb_xgetgrnam */
-
-#ifdef L_bb_xgetpwnam
-#include <stdio.h>
-#include <string.h>
-#include "libbb.h"
-#include "pwd_.h"
-#include "grp_.h"
-
/* returns a uid given a username */
long bb_xgetpwnam(const char *name)
@@ -79,9 +61,7 @@ long bb_xgetpwnam(const char *name)
return myuser->pw_uid;
}
-#endif /* L_bb_xgetpwnam */
-#ifdef L_bb_getpwuid
/* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more
* flexible :
*
@@ -99,9 +79,6 @@ long bb_xgetpwnam(const char *name)
* the program exits.
*/
-#include "libbb.h"
-#include "pwd_.h"
-
/* gets a username given a uid */
char * bb_getpwuid(char *name, long uid, int bufsize)
{
@@ -110,9 +87,7 @@ char * bb_getpwuid(char *name, long uid, int bufsize)
return bb_getug(name, (myuser) ?
myuser->pw_name : (char *)myuser , uid, bufsize, 'u');
}
-#endif /* L_bb_getpwuid */
-#ifdef L_bb_getug
/*
* if bufsize is > 0 char *buffer can not be set to NULL.
* If idname is not NULL it is written on the static
@@ -127,11 +102,6 @@ char * bb_getpwuid(char *name, long uid, int bufsize)
* else an error message is printed and the program exits.
*/
-#include <stdio.h>
-#include <assert.h>
-#include "libbb.h"
-
-
/* internal function for bb_getpwuid and bb_getgrgid */
char * bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix)
{
@@ -146,13 +116,6 @@ char * bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix)
}
return idname;
}
-#endif /* L_bb_getug */
-
-
-#ifdef L_get_ug_id
-/* indirect dispatcher for pwd helpers. */
-#include <stdlib.h>
-#include "libbb.h"
unsigned long get_ug_id(const char *s,
long (*__bb_getxxnam)(const char *))
@@ -167,4 +130,3 @@ unsigned long get_ug_id(const char *s,
return r;
}
-#endif /* L_get_ug_id */