diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-10-24 17:19:38 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-10-24 17:19:38 +0000 |
commit | 1a10eec17846b864a89834239a0533040cb504e7 (patch) | |
tree | 683eedea421bf7ded04b9eaae3f448b322c91381 | |
parent | bfebd35bea54258dfc9cbe92659c5e9f7c09adbd (diff) | |
download | busybox-w32-1a10eec17846b864a89834239a0533040cb504e7.tar.gz busybox-w32-1a10eec17846b864a89834239a0533040cb504e7.tar.bz2 busybox-w32-1a10eec17846b864a89834239a0533040cb504e7.zip |
Fixup the location of pwd.h and grp.h
-rw-r--r-- | coreutils/uudecode.c | 4 | ||||
-rw-r--r-- | debianutils/start_stop_daemon.c | 2 | ||||
-rw-r--r-- | init/start_stop_daemon.c | 2 | ||||
-rw-r--r-- | shell/ash.c | 4 | ||||
-rw-r--r-- | shell/cmdedit.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index a4059ddfe..6e7705ed1 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c | |||
@@ -29,8 +29,8 @@ | |||
29 | #include <string.h> | 29 | #include <string.h> |
30 | #include <stdlib.h> | 30 | #include <stdlib.h> |
31 | #include "busybox.h" | 31 | #include "busybox.h" |
32 | #include "pwd_grp/pwd.h" | 32 | #include "pwd.h" |
33 | #include "pwd_grp/grp.h" | 33 | #include "grp.h" |
34 | 34 | ||
35 | /*struct passwd *getpwnam();*/ | 35 | /*struct passwd *getpwnam();*/ |
36 | 36 | ||
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 0152283ad..f8b2d936c 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <sys/stat.h> | 16 | #include <sys/stat.h> |
17 | #include <dirent.h> | 17 | #include <dirent.h> |
18 | #include <unistd.h> | 18 | #include <unistd.h> |
19 | #include <pwd.h> | 19 | #include "pwd.h" |
20 | 20 | ||
21 | #include "busybox.h" | 21 | #include "busybox.h" |
22 | 22 | ||
diff --git a/init/start_stop_daemon.c b/init/start_stop_daemon.c index 0152283ad..f8b2d936c 100644 --- a/init/start_stop_daemon.c +++ b/init/start_stop_daemon.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <sys/stat.h> | 16 | #include <sys/stat.h> |
17 | #include <dirent.h> | 17 | #include <dirent.h> |
18 | #include <unistd.h> | 18 | #include <unistd.h> |
19 | #include <pwd.h> | 19 | #include "pwd.h" |
20 | 20 | ||
21 | #include "busybox.h" | 21 | #include "busybox.h" |
22 | 22 | ||
diff --git a/shell/ash.c b/shell/ash.c index 8544d8131..ffafcfeb4 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -89,7 +89,6 @@ | |||
89 | #include <fcntl.h> | 89 | #include <fcntl.h> |
90 | #include <limits.h> | 90 | #include <limits.h> |
91 | #include <paths.h> | 91 | #include <paths.h> |
92 | #include <pwd.h> | ||
93 | #include <setjmp.h> | 92 | #include <setjmp.h> |
94 | #include <signal.h> | 93 | #include <signal.h> |
95 | #include <stdarg.h> | 94 | #include <stdarg.h> |
@@ -107,6 +106,7 @@ | |||
107 | #include <sys/times.h> | 106 | #include <sys/times.h> |
108 | #include <sys/types.h> | 107 | #include <sys/types.h> |
109 | #include <sys/wait.h> | 108 | #include <sys/wait.h> |
109 | #include "pwd.h" | ||
110 | 110 | ||
111 | 111 | ||
112 | #if !defined(FNMATCH_BROKEN) | 112 | #if !defined(FNMATCH_BROKEN) |
@@ -12627,7 +12627,7 @@ findvar(struct var **vpp, const char *name) | |||
12627 | /* | 12627 | /* |
12628 | * Copyright (c) 1999 Herbert Xu <herbert@debian.org> | 12628 | * Copyright (c) 1999 Herbert Xu <herbert@debian.org> |
12629 | * This file contains code for the times builtin. | 12629 | * This file contains code for the times builtin. |
12630 | * $Id: ash.c,v 1.30 2001/10/24 08:01:06 andersen Exp $ | 12630 | * $Id: ash.c,v 1.31 2001/10/24 17:19:35 andersen Exp $ |
12631 | */ | 12631 | */ |
12632 | static int timescmd (int argc, char **argv) | 12632 | static int timescmd (int argc, char **argv) |
12633 | { | 12633 | { |
diff --git a/shell/cmdedit.c b/shell/cmdedit.c index d1b9111ea..d57e4c12b 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c | |||
@@ -82,7 +82,7 @@ | |||
82 | 82 | ||
83 | #ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR | 83 | #ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR |
84 | # ifndef TEST | 84 | # ifndef TEST |
85 | # include "pwd_grp/pwd.h" | 85 | # include "pwd.h" |
86 | # else | 86 | # else |
87 | # include <pwd.h> | 87 | # include <pwd.h> |
88 | # endif /* TEST */ | 88 | # endif /* TEST */ |