diff options
31 files changed, 42 insertions, 42 deletions
@@ -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 9dcfe6b..cfcff3a 100644 --- 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 6e7705e..a5ac002 100644 --- 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 6b09043..5765261 100644 --- 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 index 12fecd0..0ce274c 100644 --- a/include/grp.h +++ b/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 diff --git a/include/libbb.h b/include/libbb.h index f83cc76..02babb8 100644 --- 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 index 178e9e9..3f081e8 100644 --- a/include/pwd.h +++ b/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 diff --git a/init/start_stop_daemon.c b/init/start_stop_daemon.c index 6b09043..5765261 100644 --- 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 bf2067e..88bafc9 100644 --- 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 f21d482..f80d3f8 100644 --- 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 db7f4a6..04951a4 100644 --- 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 4866b97..07e02c1 100644 --- 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 5236c7d..2abe7a7 100644 --- 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 571da3f..39cf189 100644 --- 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 e406b88..d553250 100644 --- 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 c5d63e0..1492a1a 100644 --- 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 6537600..54c3b3a 100644 --- 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 e70346a..73f0cca 100644 --- 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 62b2b26..919622e 100644 --- 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 ca11188..d46e2c7 100644 --- 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 88a31f8..524fa09 100644 --- 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 776ed12..819c874 100644 --- 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 5b1cb68..df91955 100644 --- 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 9b5dcbc..57b25f3 100644 --- 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 88dffc9..de285eb 100644 --- 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 84bd617..1f42397 100644 --- 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 c9b86f0..c3af1ea 100644 --- 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 87e98fb..4a5ef85 100644 --- 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 67ecc01..dcbcee2 100644 --- 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 80da35b..366f704 100644 --- 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 4c502df..c5f2e9d 100644 --- 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 */ |