Fix for broken handling off BusyBox's own pwd/grp implementations
[Parts of this patch may overlap with my other two patches]
diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c
index 27b6719..bf2067e 100644
--- a/libbb/my_getgrgid.c
+++ b/libbb/my_getgrgid.c
@@ -21,9 +21,9 @@
#include <stdio.h>
#include <string.h>
+#include "libbb.h"
#include "pwd.h"
#include "grp.h"
-#include "libbb.h"
/* gets a groupname given a gid */
diff --git a/libbb/my_getgrnam.c b/libbb/my_getgrnam.c
index dbacf51..f21d482 100644
--- a/libbb/my_getgrnam.c
+++ b/libbb/my_getgrnam.c
@@ -21,9 +21,9 @@
#include <stdio.h>
#include <string.h>
+#include "libbb.h"
#include "pwd.h"
#include "grp.h"
-#include "libbb.h"
/* returns a gid given a group name */
diff --git a/libbb/my_getpwnam.c b/libbb/my_getpwnam.c
index 9027704..db7f4a6 100644
--- a/libbb/my_getpwnam.c
+++ b/libbb/my_getpwnam.c
@@ -21,9 +21,9 @@
#include <stdio.h>
#include <string.h>
+#include "libbb.h"
#include "pwd.h"
#include "grp.h"
-#include "libbb.h"
/* returns a uid given a username */
diff --git a/libbb/my_getpwnamegid.c b/libbb/my_getpwnamegid.c
index 9c45580..4866b97 100644
--- a/libbb/my_getpwnamegid.c
+++ b/libbb/my_getpwnamegid.c
@@ -21,9 +21,9 @@
#include <stdio.h>
#include <string.h>
+#include "libbb.h"
#include "pwd.h"
#include "grp.h"
-#include "libbb.h"
diff --git a/libbb/my_getpwuid.c b/libbb/my_getpwuid.c
index 49bc8fb..5236c7d 100644
--- a/libbb/my_getpwuid.c
+++ b/libbb/my_getpwuid.c
@@ -21,9 +21,9 @@
#include <stdio.h>
#include <string.h>
+#include "libbb.h"
#include "pwd.h"
#include "grp.h"
-#include "libbb.h"