Fixup the location of pwd.h and grp.h

diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index a4059ddfe9b78c34221a902fe9d68994a0dfceb2..6e7705ed17e24b5d30cb115777531e89659e39b9 100644 (file)
--- 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 0152283ad5458703600ad235686970f3ca28dac4..f8b2d936c3aaaed53ac28f0352f5960c91784b68 100644 (file)
--- 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 0152283ad5458703600ad235686970f3ca28dac4..f8b2d936c3aaaed53ac28f0352f5960c91784b68 100644 (file)
--- 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 8544d8131bb0e0efe97e1011d0303f30a3ac037e..ffafcfeb450826f74857d510481484138a9a5c56 100644 (file)
--- 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 d1b9111ea63a744b53c15468c2aeedf22aac1110..d57e4c12bb085794b002768b34d58ad519bd8a13 100644 (file)
--- 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 */