From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 24 Oct 2001 17:19:38 +0000 (-0000)
Subject: Fixup the location of pwd.h and grp.h
X-Git-Tag: 0_60_2~97
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a10eec17846b864a89834239a0533040cb504e7;p=oweals%2Fbusybox.git

Fixup the location of pwd.h and grp.h
---

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 @@
 #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 0152283ad..f8b2d936c 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 0152283ad..f8b2d936c 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 8544d8131..ffafcfeb4 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 d1b9111ea..d57e4c12b 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 */