svn commit: branches/busybox_scratch/archival: libunarchive

aldot at busybox.net aldot at busybox.net
Sun Aug 20 10:38:29 UTC 2006


Author: aldot
Date: 2006-08-20 03:38:28 -0700 (Sun, 20 Aug 2006)
New Revision: 15827

Log:
- cleanup includes and use shorter boilerplate. No objcode changes.


Modified:
   branches/busybox_scratch/archival/dpkg.c
   branches/busybox_scratch/archival/libunarchive/Makefile
   branches/busybox_scratch/archival/libunarchive/archive_xread_all.c
   branches/busybox_scratch/archival/libunarchive/archive_xread_all_eof.c
   branches/busybox_scratch/archival/libunarchive/check_header_gzip.c
   branches/busybox_scratch/archival/libunarchive/data_align.c
   branches/busybox_scratch/archival/libunarchive/data_extract_all.c
   branches/busybox_scratch/archival/libunarchive/data_extract_to_stdout.c
   branches/busybox_scratch/archival/libunarchive/data_skip.c
   branches/busybox_scratch/archival/libunarchive/decompress_bunzip2.c
   branches/busybox_scratch/archival/libunarchive/decompress_uncompress.c
   branches/busybox_scratch/archival/libunarchive/decompress_unzip.c
   branches/busybox_scratch/archival/libunarchive/filter_accept_all.c
   branches/busybox_scratch/archival/libunarchive/filter_accept_list.c
   branches/busybox_scratch/archival/libunarchive/filter_accept_list_reassign.c
   branches/busybox_scratch/archival/libunarchive/filter_accept_reject_list.c
   branches/busybox_scratch/archival/libunarchive/find_list_entry.c
   branches/busybox_scratch/archival/libunarchive/get_header_ar.c
   branches/busybox_scratch/archival/libunarchive/get_header_cpio.c
   branches/busybox_scratch/archival/libunarchive/get_header_tar.c
   branches/busybox_scratch/archival/libunarchive/get_header_tar_bz2.c
   branches/busybox_scratch/archival/libunarchive/get_header_tar_gz.c
   branches/busybox_scratch/archival/libunarchive/header_list.c
   branches/busybox_scratch/archival/libunarchive/header_skip.c
   branches/busybox_scratch/archival/libunarchive/header_verbose_list.c
   branches/busybox_scratch/archival/libunarchive/init_handle.c
   branches/busybox_scratch/archival/libunarchive/open_transformer.c
   branches/busybox_scratch/archival/libunarchive/seek_by_char.c
   branches/busybox_scratch/archival/libunarchive/seek_by_jump.c
   branches/busybox_scratch/archival/libunarchive/unpack_ar_archive.c


Changeset:
Modified: branches/busybox_scratch/archival/dpkg.c
===================================================================
--- branches/busybox_scratch/archival/dpkg.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/dpkg.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -23,14 +23,11 @@
  *
  */
 
-#include <fcntl.h>
+#include "busybox.h"
 #include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include "unarchive.h"
-#include "busybox.h"
 
+
 /* NOTE: If you vary HASH_PRIME sizes be aware,
  * 1) Tweaking these will have a big effect on how much memory this program uses.
  * 2) For computational efficiency these hash tables should be at least 20%

Modified: branches/busybox_scratch/archival/libunarchive/Makefile
===================================================================
--- branches/busybox_scratch/archival/libunarchive/Makefile	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/Makefile	2006-08-20 10:38:28 UTC (rev 15827)
@@ -2,20 +2,7 @@
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen at codepoet.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 GPLv2 or later, see file LICENSE in this tarball for details.
 
 ifndef top_srcdir
 top_srcdir=../..

Modified: branches/busybox_scratch/archival/libunarchive/archive_xread_all.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/archive_xread_all.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/archive_xread_all.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,25 +1,11 @@
 /*
- *  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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
+
 void archive_xread_all(const archive_handle_t *archive_handle, void *buf, const size_t count)
 {
 	ssize_t size;

Modified: branches/busybox_scratch/archival/libunarchive/archive_xread_all_eof.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/archive_xread_all_eof.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/archive_xread_all_eof.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,25 +1,11 @@
 /*
- *  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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
+
 ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count)
 {
 	ssize_t size;

Modified: branches/busybox_scratch/archival/libunarchive/check_header_gzip.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/check_header_gzip.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/check_header_gzip.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,5 +1,3 @@
-#include <stdlib.h>
-#include <unistd.h>
 #include "libbb.h"
 #include "unarchive.h" /* for external decl of check_header_gzip */
 

Modified: branches/busybox_scratch/archival/libunarchive/data_align.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/data_align.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/data_align.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,25 +1,9 @@
 /*
- *  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 <sys/types.h>
-
-#include <errno.h>
-#include <unistd.h>
-
 #include "libbb.h"
+#include <errno.h>
 #include "unarchive.h"
 
 void data_align(archive_handle_t *archive_handle, const unsigned short boundary)

Modified: branches/busybox_scratch/archival/libunarchive/data_extract_all.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/data_extract_all.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/data_extract_all.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,30 +1,12 @@
 /*
- *  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 <sys/types.h>
 
+#include "libbb.h"
 #include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
 #include <utime.h>
-#include <unistd.h>
-#include <stdlib.h>
 
-#include "libbb.h"
 #include "unarchive.h"
 
 void data_extract_all(archive_handle_t *archive_handle)

Modified: branches/busybox_scratch/archival/libunarchive/data_extract_to_stdout.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/data_extract_to_stdout.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/data_extract_to_stdout.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,21 +1,9 @@
 /*
- *  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 "libbb.h"
 #include "unarchive.h"
-#include <unistd.h>
 
 void data_extract_to_stdout(archive_handle_t *archive_handle)
 {

Modified: branches/busybox_scratch/archival/libunarchive/data_skip.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/data_skip.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/data_skip.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,26 +1,12 @@
 /*
- *  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 <sys/types.h>
+#include "libbb.h"
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include "unarchive.h"
-#include "libbb.h"
 
+
 void data_skip(archive_handle_t *archive_handle)
 {
 	archive_handle->seek(archive_handle, archive_handle->file_header->size);

Modified: branches/busybox_scratch/archival/libunarchive/decompress_bunzip2.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/decompress_bunzip2.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/decompress_bunzip2.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -28,15 +28,10 @@
 	Manuel
  */
 
+#include "libbb.h"
 #include <setjmp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <limits.h>
 
-#include "libbb.h"
-
 #include "unarchive.h"
 
 /* Constants for Huffman coding */

Modified: branches/busybox_scratch/archival/libunarchive/decompress_uncompress.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/decompress_uncompress.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/decompress_uncompress.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,5 +1,3 @@
-#include "libbb.h"
-
 /* uncompress for busybox -- (c) 2002 Robert Griebl
  *
  * based on the original compress42.c source
@@ -25,9 +23,7 @@
  * [... History snipped ...]
  *
  */
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
+#include "libbb.h"
 
 /* Default input buffer size */
 #define	IBUFSIZ	2048

Modified: branches/busybox_scratch/archival/libunarchive/decompress_unzip.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/decompress_unzip.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/decompress_unzip.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -29,7 +29,7 @@
  * Ken Turkowski, Dave Mack and Peter Jannesen.
  *
  * See the file algorithm.doc for the compression algorithms and file formats.
- * 
+ *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 

Modified: branches/busybox_scratch/archival/libunarchive/filter_accept_all.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/filter_accept_all.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/filter_accept_all.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 /* Accept any non-null name, its not really a filter at all */

Modified: branches/busybox_scratch/archival/libunarchive/filter_accept_list.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/filter_accept_list.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/filter_accept_list.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 /*

Modified: branches/busybox_scratch/archival/libunarchive/filter_accept_list_reassign.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/filter_accept_list_reassign.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/filter_accept_list_reassign.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,25 +1,9 @@
 /*
  *  Copyright (C) 2002 by Glenn McGrath
  *
- *  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 <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "libbb.h"
 #include "unarchive.h"
 

Modified: branches/busybox_scratch/archival/libunarchive/filter_accept_reject_list.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/filter_accept_reject_list.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/filter_accept_reject_list.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
 /*

Modified: branches/busybox_scratch/archival/libunarchive/find_list_entry.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/find_list_entry.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/find_list_entry.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -5,8 +5,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include "libbb.h"
 #include <fnmatch.h>
-#include <stdlib.h>
 #include "unarchive.h"
 
 /* Find a string in a list */

Modified: branches/busybox_scratch/archival/libunarchive/get_header_ar.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/get_header_ar.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/get_header_ar.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -3,12 +3,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
 char get_header_ar(archive_handle_t *archive_handle)
 {

Modified: branches/busybox_scratch/archival/libunarchive/get_header_cpio.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/get_header_cpio.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/get_header_cpio.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -3,14 +3,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "libbb.h"
 #include <sys/sysmacros.h>     /* major() and minor() */
 #include "unarchive.h"
-#include "libbb.h"
 
+
 typedef struct hardlinks_s {
 	file_header_t *entry;
 	int inode;

Modified: branches/busybox_scratch/archival/libunarchive/get_header_tar.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/get_header_tar.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/get_header_tar.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -10,13 +10,11 @@
  *	http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "libbb.h"
 #include <sys/sysmacros.h>	/* For makedev */
 #include "unarchive.h"
-#include "libbb.h"
 
+
 #ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
 static char *longname = NULL;
 static char *linkname = NULL;

Modified: branches/busybox_scratch/archival/libunarchive/get_header_tar_bz2.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/get_header_tar_bz2.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/get_header_tar_bz2.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,27 +1,10 @@
 /*
- *  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 <sys/types.h>
+#include "libbb.h"
 #include <sys/wait.h>
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "libbb.h"
 #include "unarchive.h"
 
 char get_header_tar_bz2(archive_handle_t *archive_handle)

Modified: branches/busybox_scratch/archival/libunarchive/get_header_tar_gz.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/get_header_tar_gz.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/get_header_tar_gz.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,21 +1,7 @@
 /*
- *  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 "libbb.h"
 #include "unarchive.h"
 

Modified: branches/busybox_scratch/archival/libunarchive/header_list.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/header_list.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/header_list.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "unarchive.h"
 
 void header_list(const file_header_t *file_header)

Modified: branches/busybox_scratch/archival/libunarchive/header_skip.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/header_skip.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/header_skip.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "unarchive.h"
 
 void header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED)

Modified: branches/busybox_scratch/archival/libunarchive/header_verbose_list.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/header_verbose_list.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/header_verbose_list.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,7 +1,5 @@
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
 #include "libbb.h"
+#include <time.h>
 #include "unarchive.h"
 
 void header_verbose_list(const file_header_t *file_header)

Modified: branches/busybox_scratch/archival/libunarchive/init_handle.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/init_handle.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/init_handle.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,21 +1,7 @@
 /*
- *  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 <unistd.h>
-#include <string.h>
 #include "libbb.h"
 #include "unarchive.h"
 

Modified: branches/busybox_scratch/archival/libunarchive/open_transformer.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/open_transformer.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/open_transformer.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -2,9 +2,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-
 #include "libbb.h"
 
 #include "unarchive.h"

Modified: branches/busybox_scratch/archival/libunarchive/seek_by_char.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/seek_by_char.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/seek_by_char.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -3,13 +3,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
-
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.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.
  *

Modified: branches/busybox_scratch/archival/libunarchive/seek_by_jump.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/seek_by_jump.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/seek_by_jump.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -1,25 +1,9 @@
 /*
- *  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 <sys/types.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-
 #include "libbb.h"
+#include <errno.h>
 #include "unarchive.h"
 
 void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount)

Modified: branches/busybox_scratch/archival/libunarchive/unpack_ar_archive.c
===================================================================
--- branches/busybox_scratch/archival/libunarchive/unpack_ar_archive.c	2006-08-18 18:29:40 UTC (rev 15826)
+++ branches/busybox_scratch/archival/libunarchive/unpack_ar_archive.c	2006-08-20 10:38:28 UTC (rev 15827)
@@ -2,12 +2,10 @@
 /*
  * 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 "libbb.h"
+#include "unarchive.h"
 
+
 void unpack_ar_archive(archive_handle_t *ar_archive)
 {
 	char magic[7];




More information about the busybox-cvs mailing list