diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2002-07-03 23:19:26 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2002-07-03 23:19:26 +0000 |
commit | 851036f3faecf4b664ccec9e77a3d274a2492741 (patch) | |
tree | 25f08b2b2ea8b333aac91b6b75876f82a4cfef6f /shell | |
parent | 87d618846726b0ab2ff9d3f7e2d687e554743e2b (diff) | |
download | busybox-w32-851036f3faecf4b664ccec9e77a3d274a2492741.tar.gz busybox-w32-851036f3faecf4b664ccec9e77a3d274a2492741.tar.bz2 busybox-w32-851036f3faecf4b664ccec9e77a3d274a2492741.zip |
Scrub pwd.h and grp.h handling so we don't have to play any
silly games.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@5011 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 4 | ||||
-rw-r--r-- | shell/cmdedit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 80da35b59..366f704be 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -69,7 +69,7 @@ | |||
69 | #include <sys/types.h> | 69 | #include <sys/types.h> |
70 | #include <sys/wait.h> | 70 | #include <sys/wait.h> |
71 | #include "busybox.h" | 71 | #include "busybox.h" |
72 | #include "pwd.h" | 72 | #include "pwd_.h" |
73 | 73 | ||
74 | 74 | ||
75 | #if !defined(FNMATCH_BROKEN) | 75 | #if !defined(FNMATCH_BROKEN) |
@@ -12442,7 +12442,7 @@ findvar(struct var **vpp, const char *name) | |||
12442 | /* | 12442 | /* |
12443 | * Copyright (c) 1999 Herbert Xu <herbert@debian.org> | 12443 | * Copyright (c) 1999 Herbert Xu <herbert@debian.org> |
12444 | * This file contains code for the times builtin. | 12444 | * This file contains code for the times builtin. |
12445 | * $Id: ash.c,v 1.52 2002/06/06 12:07:28 andersen Exp $ | 12445 | * $Id: ash.c,v 1.53 2002/07/03 23:19:22 andersen Exp $ |
12446 | */ | 12446 | */ |
12447 | static int timescmd (int argc, char **argv) | 12447 | static int timescmd (int argc, char **argv) |
12448 | { | 12448 | { |
diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 4c502df12..c5f2e9da2 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.h" | 85 | # include "pwd_.h" |
86 | # else | 86 | # else |
87 | # include <pwd.h> | 87 | # include <pwd.h> |
88 | # endif /* TEST */ | 88 | # endif /* TEST */ |