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

  and eventual platform specific includes in early.

3 files changed, 6 insertions, 30 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 17a1a5656..f8bcccaf5 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -7,22 +7,10 @@
  * Reworked by David Douthitt <n9ubh@callsign.net> and
  *  Matt Kraai <kraai@alumni.carnegiemellon.edu>.
  *
- * 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 the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -31,7 +19,6 @@
 #include <fnmatch.h>
 #include <time.h>
 #include <ctype.h>
-#include "busybox.h"
 
 //XXX just found out about libbb/messages.c . maybe move stuff there ? - ghoz
 static const char msg_req_arg[] = "option `%s' requires an argument";
diff --git a/findutils/grep.c b/findutils/grep.c
index fac296941..a24be248b 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -16,12 +16,12 @@
  * precompiled regex
 */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
 #include <string.h>
 #include <errno.h>
-#include "busybox.h"
 #include "xregex.h"
 
 
diff --git a/findutils/xargs.c b/findutils/xargs.c
index ec6d99cac..c3a892695 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini xargs implementation for busybox
  * Options are supported: "-prtx -n max_arg -s max_chars -e[ouf_str]"
@@ -9,25 +10,14 @@
  * - Mike Rendell <michael@cs.mun.ca>
  * and David MacKenzie <djm@gnu.ai.mit.edu>.
  *
- * 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 the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * xargs is described in the Single Unix Specification v3 at
  * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html
  *
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,7 +27,6 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "busybox.h"
 
 /* COMPAT:  SYSV version defaults size (and has a max value of) to 470.
    We try to make it as large as possible. */