Scrub pwd.h and grp.h handling so we don't have to play any

silly games.
 -Erik

diff --git a/Rules.mak b/Rules.mak
index 2b0393309837838854afe699cd5591a0e6364f83..d5b0127f8918ed379eddb9ba5473eb81a24c3366 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -91,7 +91,7 @@ export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
 
 # To compile vs uClibc, just use the compiler wrapper built by uClibc...
 # Everything should compile and work as expected these days...
-#CC:=/usr/i386-linux-uclibc/usr/bin/i386-uclibc-gcc
+#CC:=/usr/i386-linux-uclibc/bin/i386-uclibc-gcc
 
 # To compile vs some other alternative libc, you may need to use/adjust
 # the following lines to meet your needs...

diff --git a/applets/applets.c b/applets/applets.c
index 9dcfe6b85119d1afb8fa27fe8ee1392ed0a05bba..cfcff3a532ad3c32be182c9abcb145a8a633a122 100644 (file)
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -50,8 +50,8 @@ static void check_suid ( struct BB_applet *app );
 
 #include <sys/stat.h>
 #include <ctype.h>
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 static int parse_config_file ( void );
 

diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 6e7705ed17e24b5d30cb115777531e89659e39b9..a5ac002e97b38e6050ee2af757aaaeace1460cd0 100644 (file)
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -29,8 +29,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "busybox.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 /*struct passwd *getpwnam();*/
 

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 6b090437f7cccee4a5bbfb0e0fd0a8d035f9c8af..5765261834369ad38311a19833cb5c7c993b75fe 100644 (file)
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include "busybox.h"
-#include "pwd.h"
+#include "pwd_.h"
 
 static int start = 0;
 static int stop = 0;

diff --git a/include/grp.h b/include/grp.h
deleted file mode 100644 (file)
index 12fecd0..0000000
--- a/include/grp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef        __CONFIG_GRP_H
-#define        __CONFIG_GRP_H
-
-#if !defined CONFIG_USE_BB_PWD_GRP
-#include_next <grp.h>
-
-#else
-
-#include <sys/types.h>
-#include <features.h>
-#include <stdio.h>
-
-
-/* The group structure */
-struct group
-{
-  char *gr_name;               /* Group name.  */
-  char *gr_passwd;             /* Password.    */
-  gid_t gr_gid;                        /* Group ID.    */
-  char **gr_mem;               /* Member list. */
-};
-
-extern void setgrent __P ((void));
-extern void endgrent __P ((void));
-extern struct group * getgrent __P ((void));
-
-extern struct group * getgrgid __P ((__const gid_t gid));
-extern struct group * getgrnam __P ((__const char * name));
-
-extern struct group * fgetgrent __P ((FILE * file));
-
-extern int setgroups __P ((size_t n, __const gid_t * groups));
-extern int initgroups __P ((__const char * user, gid_t gid));
-
-extern struct group * __getgrent __P ((int grp_fd));
-
-#endif /* USE_SYSTEM_PWD_GRP */
-#endif /* __CONFIG_GRP_H */
-

diff --git a/include/grp_.h b/include/grp_.h
new file mode 100644 (file)
index 0000000..0ce274c
--- /dev/null
+++ b/include/grp_.h
@@ -0,0 +1,39 @@
+#ifndef        __CONFIG_GRP_H
+#define        __CONFIG_GRP_H
+
+#if !defined CONFIG_USE_BB_PWD_GRP
+#include <grp.h>
+
+#else
+
+#include <sys/types.h>
+#include <features.h>
+#include <stdio.h>
+
+
+/* The group structure */
+struct group
+{
+  char *gr_name;               /* Group name.  */
+  char *gr_passwd;             /* Password.    */
+  gid_t gr_gid;                        /* Group ID.    */
+  char **gr_mem;               /* Member list. */
+};
+
+extern void setgrent __P ((void));
+extern void endgrent __P ((void));
+extern struct group * getgrent __P ((void));
+
+extern struct group * getgrgid __P ((__const gid_t gid));
+extern struct group * getgrnam __P ((__const char * name));
+
+extern struct group * fgetgrent __P ((FILE * file));
+
+extern int setgroups __P ((size_t n, __const gid_t * groups));
+extern int initgroups __P ((__const char * user, gid_t gid));
+
+extern struct group * __getgrent __P ((int grp_fd));
+
+#endif /* USE_SYSTEM_PWD_GRP */
+#endif /* __CONFIG_GRP_H */
+

diff --git a/include/libbb.h b/include/libbb.h
index f83cc7623cb225ae6108fe2bf34f5c5668bf970f..02babb884bfa26ff6c64250a05be1af78b298b0c 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -39,8 +39,8 @@
 
 #include "config.h"
 
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 #ifdef CONFIG_FEATURE_SHADOWPASSWDS
 #include "shadow_.h"
 #endif

diff --git a/include/pwd.h b/include/pwd.h
deleted file mode 100644 (file)
index 178e9e9..0000000
--- a/include/pwd.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef        __CONFIG_PWD_H
-#define        __CONFIG_PWD_H
-
-#if !defined CONFIG_USE_BB_PWD_GRP
-#include_next <pwd.h>
-
-#else
-
-#include <sys/types.h>
-#include <features.h>
-#include <stdio.h>
-
-/* The passwd structure.  */
-struct passwd
-{
-  char *pw_name;               /* Username.  */
-  char *pw_passwd;             /* Password.  */
-  uid_t pw_uid;                        /* User ID.  */
-  gid_t pw_gid;                        /* Group ID.  */
-  char *pw_gecos;              /* Real name.  */
-  char *pw_dir;                        /* Home directory.  */
-  char *pw_shell;              /* Shell program.  */
-};
-
-extern void setpwent __P ((void));
-extern void endpwent __P ((void));
-extern struct passwd * getpwent __P ((void));
-
-extern int putpwent __P ((__const struct passwd * __p, FILE * __f));
-extern int getpw __P ((uid_t uid, char *buf));
-
-extern struct passwd * fgetpwent __P ((FILE * file));
-
-extern struct passwd * getpwuid __P ((__const uid_t));
-extern struct passwd * getpwnam __P ((__const char *));
-
-extern struct passwd * __getpwent __P ((__const int passwd_fd));
-
-#endif /* USE_SYSTEM_PWD_GRP */
-#endif /* __CONFIG_PWD_H  */
-

diff --git a/include/pwd_.h b/include/pwd_.h
new file mode 100644 (file)
index 0000000..3f081e8
--- /dev/null
+++ b/include/pwd_.h
@@ -0,0 +1,41 @@
+#ifndef        __CONFIG_PWD_H
+#define        __CONFIG_PWD_H
+
+#if !defined CONFIG_USE_BB_PWD_GRP
+#include <pwd.h>
+
+#else
+
+#include <sys/types.h>
+#include <features.h>
+#include <stdio.h>
+
+/* The passwd structure.  */
+struct passwd
+{
+  char *pw_name;               /* Username.  */
+  char *pw_passwd;             /* Password.  */
+  uid_t pw_uid;                        /* User ID.  */
+  gid_t pw_gid;                        /* Group ID.  */
+  char *pw_gecos;              /* Real name.  */
+  char *pw_dir;                        /* Home directory.  */
+  char *pw_shell;              /* Shell program.  */
+};
+
+extern void setpwent __P ((void));
+extern void endpwent __P ((void));
+extern struct passwd * getpwent __P ((void));
+
+extern int putpwent __P ((__const struct passwd * __p, FILE * __f));
+extern int getpw __P ((uid_t uid, char *buf));
+
+extern struct passwd * fgetpwent __P ((FILE * file));
+
+extern struct passwd * getpwuid __P ((__const uid_t));
+extern struct passwd * getpwnam __P ((__const char *));
+
+extern struct passwd * __getpwent __P ((__const int passwd_fd));
+
+#endif /* USE_SYSTEM_PWD_GRP */
+#endif /* __CONFIG_PWD_H  */
+

diff --git a/init/start_stop_daemon.c b/init/start_stop_daemon.c
index 6b090437f7cccee4a5bbfb0e0fd0a8d035f9c8af..5765261834369ad38311a19833cb5c7c993b75fe 100644 (file)
--- a/init/start_stop_daemon.c
+++ b/init/start_stop_daemon.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include "busybox.h"
-#include "pwd.h"
+#include "pwd_.h"
 
 static int start = 0;
 static int stop = 0;

diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c
index bf2067e468bbb6eb42ace3fd8890cfaddc507795..88bafc97b177b3cda8c90b668c2936679528d9ee 100644 (file)
--- a/libbb/my_getgrgid.c
+++ b/libbb/my_getgrgid.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 
 /* gets a groupname given a gid */

diff --git a/libbb/my_getgrnam.c b/libbb/my_getgrnam.c
index f21d482c6a9cacfd4d07afdd93c6cf5ca1250f1d..f80d3f824a2a46a88cf3dfd1491bc1b306cfc9a9 100644 (file)
--- a/libbb/my_getgrnam.c
+++ b/libbb/my_getgrnam.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 
 /* returns a gid given a group name */

diff --git a/libbb/my_getpwnam.c b/libbb/my_getpwnam.c
index db7f4a65fa539a6fef9123d1e7aa7a934601a073..04951a4d0873ccd811ffe186c03d514d17e2938c 100644 (file)
--- a/libbb/my_getpwnam.c
+++ b/libbb/my_getpwnam.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 
 /* returns a uid given a username */

diff --git a/libbb/my_getpwnamegid.c b/libbb/my_getpwnamegid.c
index 4866b9717b9afec8f49ce37c9d5be258c520240b..07e02c1cf4c92b9dd633899b27cde1c716206b80 100644 (file)
--- a/libbb/my_getpwnamegid.c
+++ b/libbb/my_getpwnamegid.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 
 

diff --git a/libbb/my_getpwuid.c b/libbb/my_getpwuid.c
index 5236c7df3e309571828f7570c4123ef8d35e4144..2abe7a7f326e99ce778b3aa88d7cccbb0a9b70e8 100644 (file)
--- a/libbb/my_getpwuid.c
+++ b/libbb/my_getpwuid.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 
 

diff --git a/libpwdgrp/__getgrent.c b/libpwdgrp/__getgrent.c
index 571da3fc364d0cce7b1a0b4cf4e69647bb168faa..39cf1890a42533ed56033ddf2326f676204e871e 100644 (file)
--- a/libpwdgrp/__getgrent.c
+++ b/libpwdgrp/__getgrent.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include "grp.h"
+#include "grp_.h"
 
 /*
  * Define GR_SCALE_DYNAMIC if you want grp to dynamically scale its read buffer

diff --git a/libpwdgrp/__getpwent.c b/libpwdgrp/__getpwent.c
index e406b882457a59b7135375314afef82ec56e48db..d553250f49068e08c1321197a9bae1e8be0b6cc0 100644 (file)
--- a/libpwdgrp/__getpwent.c
+++ b/libpwdgrp/__getpwent.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 #define PWD_BUFFER_SIZE 256
 

diff --git a/libpwdgrp/fgetgrent.c b/libpwdgrp/fgetgrent.c
index c5d63e05f449a0ee3524961894a9e55f50f7f1c5..1492a1a9546150d28cc8fdd52379768b24ed336c 100644 (file)
--- a/libpwdgrp/fgetgrent.c
+++ b/libpwdgrp/fgetgrent.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "grp.h"
+#include "grp_.h"
 
 struct group *fgetgrent(FILE * file)
 {

diff --git a/libpwdgrp/fgetpwent.c b/libpwdgrp/fgetpwent.c
index 6537600ff485158de85a2187019cdd492912425f..54c3b3adc9690745a6e09f91b57f91c4943b422b 100644 (file)
--- a/libpwdgrp/fgetpwent.c
+++ b/libpwdgrp/fgetpwent.c
@@ -22,7 +22,7 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 struct passwd *fgetpwent(FILE * file)
 {

diff --git a/libpwdgrp/getgrgid.c b/libpwdgrp/getgrgid.c
index e70346a7797069f39504b9c166c1ca5c8864acde..73f0cca97c372eca0967e3c029af9366991b269b 100644 (file)
--- a/libpwdgrp/getgrgid.c
+++ b/libpwdgrp/getgrgid.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 struct group *getgrgid(const gid_t gid)
 {

diff --git a/libpwdgrp/getgrnam.c b/libpwdgrp/getgrnam.c
index 62b2b26ca7e83d5c98586dbf6c3f3a9c95aaf34c..919622ea183fdcbb52e180afb60c27dae1247ecf 100644 (file)
--- a/libpwdgrp/getgrnam.c
+++ b/libpwdgrp/getgrnam.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 struct group *getgrnam(const char *name)
 {

diff --git a/libpwdgrp/getpw.c b/libpwdgrp/getpw.c
index ca11188aa79830356e7aa221ba7d063259180afb..d46e2c7dab76def5c9710bc92536a5d548f4e63b 100644 (file)
--- a/libpwdgrp/getpw.c
+++ b/libpwdgrp/getpw.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 int getpw(uid_t uid, char *buf)
 {

diff --git a/libpwdgrp/getpwnam.c b/libpwdgrp/getpwnam.c
index 88a31f8c2bd1f78397f3b2c2a47aaa450a00374c..524fa09bea4ca23bb5ef8729e1b25a43740414fc 100644 (file)
--- a/libpwdgrp/getpwnam.c
+++ b/libpwdgrp/getpwnam.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 
 struct passwd *getpwnam(const char *name)

diff --git a/libpwdgrp/getpwuid.c b/libpwdgrp/getpwuid.c
index 776ed12da6b0c64fd1d8c22f16a617245262280e..819c874aca3ca8f3ec7b5f779167a0975321bb0a 100644 (file)
--- a/libpwdgrp/getpwuid.c
+++ b/libpwdgrp/getpwuid.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 struct passwd *getpwuid(uid_t uid)
 {

diff --git a/libpwdgrp/grent.c b/libpwdgrp/grent.c
index 5b1cb6823d78ce3fed189f251a9d4f60b7ef7417..df91955998937c1c9227aa71769b26c815a1f18c 100644 (file)
--- a/libpwdgrp/grent.c
+++ b/libpwdgrp/grent.c
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 static int grp_fd = -1;
 

diff --git a/libpwdgrp/initgroups.c b/libpwdgrp/initgroups.c
index 9b5dcbcb29bfef8f8550c37acb6ac7048957c1ff..57b25f343fb833749e5d67f777a836abc7fa5673 100644 (file)
--- a/libpwdgrp/initgroups.c
+++ b/libpwdgrp/initgroups.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 /*
  * Define GR_SCALE_DYNAMIC if you want grp to dynamically scale its read buffer

diff --git a/libpwdgrp/putpwent.c b/libpwdgrp/putpwent.c
index 88dffc9523246909b2866b843ce72c39668c75dc..de285ebaf286ed7217069833f26204df27cdcf9c 100644 (file)
--- a/libpwdgrp/putpwent.c
+++ b/libpwdgrp/putpwent.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 int putpwent(const struct passwd *passwd, FILE * f)
 {

diff --git a/libpwdgrp/pwent.c b/libpwdgrp/pwent.c
index 84bd6176bc827bf4f03e70b253925450454fdd06..1f4239741c95a42fd58f558836acabe50ded7a83 100644 (file)
--- a/libpwdgrp/pwent.c
+++ b/libpwdgrp/pwent.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "pwd.h"
+#include "pwd_.h"
 #include <fcntl.h>
 
 /*

diff --git a/libpwdgrp/setgroups.c b/libpwdgrp/setgroups.c
index c9b86f016b1eaf4afd1352eb987cb99f740c9970..c3af1ea77d5a598fbbccc5cc6bb92a7e9adbe5a3 100644 (file)
--- a/libpwdgrp/setgroups.c
+++ b/libpwdgrp/setgroups.c
@@ -35,7 +35,7 @@
 /* This is needed for libc5 */
 #include <asm/unistd.h>
 #endif
-#include "grp.h"
+#include "grp_.h"
 
 //#define __NR_setgroups        81
 _syscall2(int, setgroups, size_t, size, const gid_t *, list);

diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 87e98fb185a207713250a5f7e0edeacff06ed575..4a5ef854276b79f039e9101f555c464eb2df75b2 100644 (file)
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include "busybox.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
 
 
 /* structs __________________________ */
@@ -162,4 +162,4 @@ int addgroup_main(int argc, char **argv)
        return addgroup(group_file, group, gid);
 }
 
-/* $Id: addgroup.c,v 1.2 2002/06/23 04:24:24 andersen Exp $ */
+/* $Id: addgroup.c,v 1.3 2002/07/03 23:19:18 andersen Exp $ */

diff --git a/networking/netstat.c b/networking/netstat.c
index 67ecc0105facb355cc1a412ceb2a643336c6666f..dcbcee21d87310b5be4ac3ce585a407520ea13f8 100644 (file)
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include "inet_common.h"
 #include "busybox.h"
-#include "pwd.h"
+#include "pwd_.h"
 
 #ifdef CONFIG_ROUTE
 extern void displayroutes(int noresolve, int netstatfmt);

diff --git a/shell/ash.c b/shell/ash.c
index 80da35b59a5f06b1368bb607d0a993244f8a4c4f..366f704be8eec97fe74df94847d969f955f411e0 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -69,7 +69,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "busybox.h"
-#include "pwd.h"
+#include "pwd_.h"
 
 
 #if !defined(FNMATCH_BROKEN)
@@ -12442,7 +12442,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.52 2002/06/06 12:07:28 andersen Exp $
+ * $Id: ash.c,v 1.53 2002/07/03 23:19:22 andersen Exp $
  */
 static int timescmd (int argc, char **argv)
 {

diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 4c502df12cea2f90575d77b4e8d5e45f69764083..c5f2e9da2e7e66d322cfad57169807eccd0c8db0 100644 (file)
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -82,7 +82,7 @@
 
 #ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
 #       ifndef TEST
-#               include "pwd.h"
+#               include "pwd_.h"
 #       else
 #               include <pwd.h>
 #       endif  /* TEST */