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

silly games.
 -Erik

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...

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 "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 
 static int parse_config_file ( void );
 

coreutils/uudecode.c

@@ -29,8 +29,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "busybox.h"
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 
 /*struct passwd *getpwnam();*/
 

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;

include/grp_.h

@@ -2,7 +2,7 @@
 #define	__CONFIG_GRP_H
 
 #if !defined CONFIG_USE_BB_PWD_GRP
-#include_next <grp.h>
+#include <grp.h>
 
 #else
 

include/libbb.h

@@ -39,8 +39,8 @@
 
 #include "config.h"
 
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 #ifdef CONFIG_FEATURE_SHADOWPASSWDS
 #include "shadow_.h"
 #endif

include/pwd_.h

@@ -2,7 +2,7 @@
 #define	__CONFIG_PWD_H
 
 #if !defined CONFIG_USE_BB_PWD_GRP
-#include_next <pwd.h>
+#include <pwd.h>
 
 #else
 

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;

libbb/my_getgrgid.c

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 
 
 /* gets a groupname given a gid */

libbb/my_getgrnam.c

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 
 
 /* returns a gid given a group name */

libbb/my_getpwnam.c

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 
 
 /* returns a uid given a username */

libbb/my_getpwnamegid.c

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 
 
 

libbb/my_getpwuid.c

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "libbb.h"
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.h"
+#include "grp_.h"
 
 
 

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

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
 

libpwdgrp/fgetgrent.c

@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "grp.h"
+#include "grp_.h"
 
 struct group *fgetgrent(FILE * file)
 {

libpwdgrp/fgetpwent.c

@@ -22,7 +22,7 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 struct passwd *fgetpwent(FILE * file)
 {

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)
 {

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)
 {

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)
 {

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)

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)
 {

libpwdgrp/grent.c

@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 static int grp_fd = -1;
 

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

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)
 {

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>
 
 /*

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);

loginutils/addgroup.c

@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include "busybox.h"
-#include "pwd.h"
+#include "pwd_.h"
-#include "grp.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 $ */

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);

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)
 {

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 */