- include proper headers.

diff --git a/archival/libunarchive/seek_by_char.c b/archival/libunarchive/seek_by_char.c
index 02874db51eecc0774625de8f403f5fda7ce3b005..81d5f8d7c2d8497ed61447e1b6b186b4dd6c4b73 100644 (file)
--- a/archival/libunarchive/seek_by_char.c
+++ b/archival/libunarchive/seek_by_char.c
@@ -1,23 +1,14 @@
+/* vi:set ts=4:*/
 /*
- *  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 Library 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 <stdlib.h>
 
 #include "unarchive.h"
-#include "busybox.h"
+#include "libbb.h"
+
+
 
 /*     If we are reading through a pipe(), or from stdin then we cant lseek,
  *  we must read and discard the data to skip over it.

diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index 7bb40af5b8bc03d96d61eb0cd417b231af7d458d..15e56a46873628ce46a667b497ab73242c6eff77 100644 (file)
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -1,23 +1,12 @@
+/* vi:set ts=4:*/
 /*
- *  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 Library 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 <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include "unarchive.h"
-#include "busybox.h"
+#include "libbb.h"
 
 void unpack_ar_archive(archive_handle_t *ar_archive)
 {

diff --git a/libbb/messages.c b/libbb/messages.c
index b9a5353a7ef88cb92d32d1eae2d432d64d1d6230..ab4c5d4b136556e1343af4b802da3c912ac8a1a0 100644 (file)
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -6,7 +6,6 @@
  *
  */
 
-#include "busybox.h"
 #include "libbb.h"
 
 #ifdef L_full_version

diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index f45c6317ec4fc8cc8695524af978f7fcf6d37c64..4f4e0410f75b6a62c8229c071ddd33fe085636cf 100644 (file)
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -26,10 +26,11 @@
 #include <errno.h>
 #include <assert.h>
 #include <ctype.h>
-#include "busybox.h"
+
 #include "pwd_.h"
 #include "grp_.h"
 #include "shadow_.h"
+#include "libbb.h"
 
 #ifndef _PATH_SHADOW
 #define        _PATH_SHADOW    "/etc/shadow"

diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c
index d2915c9ee7adff1cfe54aa553061efce76fed23f..9cb1d306a33a77f38a9e3c40835cf2b04d326d11 100644 (file)
--- a/libpwdgrp/pwd_grp_internal.c
+++ b/libpwdgrp/pwd_grp_internal.c
@@ -26,10 +26,11 @@
 #include <errno.h>
 #include <assert.h>
 #include <ctype.h>
-#include "busybox.h"
+
 #include "pwd_.h"
 #include "grp_.h"
 #include "shadow_.h"
+#include "libbb.h"
 
 #ifndef _PATH_SHADOW
 #define        _PATH_SHADOW    "/etc/shadow"

diff --git a/networking/interface.c b/networking/interface.c
index 5c1ee92cd503874659dfbd4b1196aadb5964b9e5..39fd44cc2c1a2a7176aa7da9304f7253a3a5f18c 100644 (file)
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -73,7 +73,7 @@
 #include <sys/types.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-#include "libbb.h"
+#include "busybox.h"
 
 #ifdef CONFIG_FEATURE_IPV6
 # define HAVE_AFINET6 1

diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c
index a76df48e03ddb609cb3c107ed9dd732785408a16..52e549ea223b225215cbe32c95478c7d8b17542e 100644 (file)
--- a/networking/libiproute/ip_parse_common_args.c
+++ b/networking/libiproute/ip_parse_common_args.c
@@ -16,10 +16,10 @@
 
 #include <string.h>
 
+#include "libbb.h"
 #include "utils.h"
 #include "ip_common.h"
 
-#include "busybox.h"
 
 int preferred_family = AF_UNSPEC;
 int oneline = 0;