diff options
author | sandman <sandman@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2002-06-04 20:10:23 +0000 |
---|---|---|
committer | sandman <sandman@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2002-06-04 20:10:23 +0000 |
commit | 833593c5b14bd14e14180776f15a8368f1a5f5dd (patch) | |
tree | 3a71fbfa44c5a0887409c930a682c896aecb7425 /shell | |
parent | 594f51c1b93a4e0b10d23cb5f23deb3ce10bab08 (diff) | |
download | busybox-w32-833593c5b14bd14e14180776f15a8368f1a5f5dd.tar.gz busybox-w32-833593c5b14bd14e14180776f15a8368f1a5f5dd.tar.bz2 busybox-w32-833593c5b14bd14e14180776f15a8368f1a5f5dd.zip |
Fix for broken handling off BusyBox's own pwd/grp implementations
[Parts of this patch may overlap with my other two patches]
git-svn-id: svn://busybox.net/trunk/busybox@4856 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index f3b641d53..d834cc02a 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -68,6 +68,7 @@ | |||
68 | #include <sys/times.h> | 68 | #include <sys/times.h> |
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 "pwd.h" | 72 | #include "pwd.h" |
72 | 73 | ||
73 | 74 | ||
@@ -82,7 +83,6 @@ | |||
82 | #include <termios.h> | 83 | #include <termios.h> |
83 | #endif | 84 | #endif |
84 | 85 | ||
85 | #include "busybox.h" | ||
86 | #include "cmdedit.h" | 86 | #include "cmdedit.h" |
87 | 87 | ||
88 | /* | 88 | /* |
@@ -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.50 2002/05/14 23:22:06 sandman Exp $ | 12445 | * $Id: ash.c,v 1.51 2002/06/04 20:10:15 sandman Exp $ |
12446 | */ | 12446 | */ |
12447 | static int timescmd (int argc, char **argv) | 12447 | static int timescmd (int argc, char **argv) |
12448 | { | 12448 | { |