summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-10-24 17:19:38 +0000
committerEric Andersen2001-10-24 17:19:38 +0000
commit1a10eec17846b864a89834239a0533040cb504e7 (patch)
tree683eedea421bf7ded04b9eaae3f448b322c91381
parentbfebd35bea54258dfc9cbe92659c5e9f7c09adbd (diff)
downloadbusybox-1a10eec17846b864a89834239a0533040cb504e7.zip
busybox-1a10eec17846b864a89834239a0533040cb504e7.tar.gz
Fixup the location of pwd.h and grp.h
-rw-r--r--coreutils/uudecode.c4
-rw-r--r--debianutils/start_stop_daemon.c2
-rw-r--r--init/start_stop_daemon.c2
-rw-r--r--shell/ash.c4
-rw-r--r--shell/cmdedit.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index a4059dd..6e7705e 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -29,8 +29,8 @@
#include <string.h>
#include <stdlib.h>
#include "busybox.h"
-#include "pwd_grp/pwd.h"
-#include "pwd_grp/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 0152283..f8b2d93 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <dirent.h>
#include <unistd.h>
-#include <pwd.h>
+#include "pwd.h"
#include "busybox.h"
diff --git a/init/start_stop_daemon.c b/init/start_stop_daemon.c
index 0152283..f8b2d93 100644
--- a/init/start_stop_daemon.c
+++ b/init/start_stop_daemon.c
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <dirent.h>
#include <unistd.h>
-#include <pwd.h>
+#include "pwd.h"
#include "busybox.h"
diff --git a/shell/ash.c b/shell/ash.c
index 8544d81..ffafcfe 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -89,7 +89,6 @@
#include <fcntl.h>
#include <limits.h>
#include <paths.h>
-#include <pwd.h>
#include <setjmp.h>
#include <signal.h>
#include <stdarg.h>
@@ -107,6 +106,7 @@
#include <sys/times.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include "pwd.h"
#if !defined(FNMATCH_BROKEN)
@@ -12627,7 +12627,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.30 2001/10/24 08:01:06 andersen Exp $
+ * $Id: ash.c,v 1.31 2001/10/24 17:19:35 andersen Exp $
*/
static int timescmd (int argc, char **argv)
{
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index d1b9111..d57e4c1 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -82,7 +82,7 @@
#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
# ifndef TEST
-# include "pwd_grp/pwd.h"
+# include "pwd.h"
# else
# include <pwd.h>
# endif /* TEST */