- move #include busybox.h to the very top so we pull in the config

  and eventual platform specific includes in early.

6 files changed, 16 insertions, 43 deletions

diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index 09c79f504..495a2ea3a 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -9,12 +9,12 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include "busybox.h"
 
 int mktemp_main(int argc, char **argv)
 {
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index 95db16783..75d26e20f 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -1,35 +1,22 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Monitor a pipe with a simple progress display.
  *
  * Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
 
-#include "busybox.h"
-
 #define PIPE_PROGRESS_SIZE 4096
 
-/*	Read a block of data from stdin, write it to stdout.
- *  Activity is indicated by a '.' to stderr
+/* Read a block of data from stdin, write it to stdout.
+ * Activity is indicated by a '.' to stderr
  */
 int pipe_progress_main(int argc, char **argv)
 {
@@ -48,8 +35,8 @@ int pipe_progress_main(int argc, char **argv)
 
 	fputc('\n', stderr);
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
-	RELEASE_CONFIG_BUFFER(buf);
-#endif
+	if (ENABLE_FEATURE_CLEAN_UP)
+		RELEASE_CONFIG_BUFFER(buf);
+
 	return 0;
 }
diff --git a/debianutils/readlink.c b/debianutils/readlink.c
index 79f0870ec..10fb01ebf 100644
--- a/debianutils/readlink.c
+++ b/debianutils/readlink.c
@@ -7,11 +7,11 @@
  * Licensed under GPL v2, see file LICENSE in this tarball for details.
  */
 
+#include "busybox.h"
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include "busybox.h"
 
 #define READLINK_FLAG_f	(1 << 0)
 
@@ -33,7 +33,8 @@ int readlink_main(int argc, char **argv)
 		return EXIT_FAILURE;
 	puts(buf);
 
-	if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1) free(buf);
+	if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1)
+		free(buf);
 
 	return EXIT_SUCCESS;
 }
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 862db7a05..c54e515fe 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -10,21 +10,7 @@
  *   Copyright (C) 1996-1999 Guy Maor <maor@debian.org>
  *
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
+ * Licensed under GPL v2, see file LICENSE in this tarball for details.
  */
 
 /* This is my first attempt to write a program in C (well, this is my first
@@ -49,10 +35,10 @@
  * done - declare run_parts_main() as extern and any other function as static?
  */
 
+#include "busybox.h"
 #include <getopt.h>
 #include <stdlib.h>
 
-#include "busybox.h"
 
 static const struct option runparts_long_options[] = {
 	{ "test",		0,		NULL,		't' },
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 5c596c40a..b83a75994 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -7,6 +7,7 @@
  * Adapted for busybox David Kimdon <dwhedon@gordian.com>
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,8 +18,6 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <getopt.h> /* struct option */
-
-#include "busybox.h"
 #include "pwd_.h"
 
 static int signal_nr = 15;
diff --git a/debianutils/which.c b/debianutils/which.c
index 03b3c30f9..62cb1dc6d 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -9,12 +9,12 @@
  * Based on which from debianutils
  */
 
+#include "busybox.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "busybox.h"
 
 int which_main(int argc, char **argv)
 {