Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate

things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only
had one user), clean up lots of #includes...  General cleanup pass.  What I've
been doing for the last couple days.

And it conflicts!  I've removed httpd.c from this checkin due to somebody else
touching that file.  It builds for me.  I have to catch a bus.  (Now you know
why I'm looking forward to Mercurial.)

6 files changed, 13 insertions, 46 deletions

diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 6337e0c85..5d1ec302a 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -3,16 +3,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/types.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"
 
@@ -23,7 +13,7 @@ void data_extract_all(archive_handle_t *archive_handle)
 	int res;
 
 	if (archive_handle->flags & ARCHIVE_CREATE_LEADING_DIRS) {
-		char *name = bb_xstrdup(file_header->name);
+		char *name = xstrdup(file_header->name);
 		bb_make_directory (dirname(name), -1, FILEUTILS_RECUR);
 		free(name);
 	}
@@ -68,7 +58,7 @@ void data_extract_all(archive_handle_t *archive_handle)
 		switch(file_header->mode & S_IFMT) {
 			case S_IFREG: {
 				/* Regular file */
-				dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL);
+				dst_fd = xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL);
 				bb_copyfd_size(archive_handle->src_fd, dst_fd, file_header->size);
 				close(dst_fd);
 				break;
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c
index ae96ea375..657d4ab01 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libunarchive/decompress_bunzip2.c
@@ -28,15 +28,7 @@
 	Manuel
  */
 
-#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 */
@@ -655,7 +647,7 @@ static int start_bunzip(bunzip_data **bdp, int in_fd, unsigned char *inbuf,
 
 	/* Init the CRC32 table (big endian) */
 
-	bd->crc32Table = bb_crc32_filltable(1);
+	bd->crc32Table = crc32_filltable(1);
 
 	/* Setup for I/O error handling via longjmp */
 
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 8f33e6e6c..7362da8c2 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -34,8 +34,6 @@
  */
 
 #include "libbb.h"
-#include <sys/wait.h>
-#include <signal.h>
 #include "unarchive.h"
 
 typedef struct huft_s {
@@ -853,7 +851,7 @@ int inflate_unzip(int in, int out)
 	gunzip_bb = 0;
 
 	/* Create the crc table */
-	gunzip_crc_table = bb_crc32_filltable(0);
+	gunzip_crc_table = crc32_filltable(0);
 	gunzip_crc = ~0;
 	
 	/* Allocate space for buffer */
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c
index 4627695e4..cabb4101b 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libunarchive/get_header_ar.c
@@ -4,12 +4,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)
 {
@@ -31,7 +27,7 @@ char get_header_ar(archive_handle_t *archive_handle)
 	static unsigned int ar_long_name_size;
 #endif
 
-	/* dont use bb_xread as we want to handle the error ourself */
+	/* dont use xread as we want to handle the error ourself */
 	if (read(archive_handle->src_fd, ar.raw, 60) != 60) {
 		/* End Of File */
 		return(EXIT_FAILURE);
@@ -85,14 +81,14 @@ char get_header_ar(archive_handle_t *archive_handle)
 			if (long_offset >= ar_long_name_size) {
 				bb_error_msg_and_die("Cant resolve long filename");
 			}
-			typed->name = bb_xstrdup(ar_long_names + long_offset);
+			typed->name = xstrdup(ar_long_names + long_offset);
 		}
 #else
 		bb_error_msg_and_die("long filenames not supported");
 #endif
 	} else {
 		/* short filenames */
-	       typed->name = bb_xstrndup(ar.formatted.name, 16);
+	       typed->name = xstrndup(ar.formatted.name, 16);
 	}
 
 	typed->name[strcspn(typed->name, " /")] = '\0';
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c
index 28c743589..d405d0e1b 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -4,13 +4,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 <sys/sysmacros.h>     /* major() and minor() */
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
 typedef struct hardlinks_s {
 	file_header_t *entry;
@@ -123,7 +118,7 @@ char get_header_cpio(archive_handle_t *archive_handle)
 			pending_hardlinks = 1;
 			while (tmp) {
 				if (tmp->inode == inode) {
-					tmp->entry->link_name = bb_xstrdup(file_header->name);
+					tmp->entry->link_name = xstrdup(file_header->name);
 					nlink--;
 				}
 				tmp = tmp->next;
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index fb7e9ae8f..0c622f44a 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -11,12 +11,8 @@
  *	http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/sysmacros.h>	/* For makedev */
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
 #ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
 static char *longname = NULL;
@@ -106,7 +102,7 @@ char get_header_tar(archive_handle_t *archive_handle)
 	} else
 #endif
 	{
-		file_header->name = bb_xstrndup(tar.formatted.name,100);
+		file_header->name = xstrndup(tar.formatted.name,100);
 
 		if (tar.formatted.prefix[0]) {
 			char *temp = file_header->name;
@@ -120,7 +116,7 @@ char get_header_tar(archive_handle_t *archive_handle)
 	file_header->size = strtol(tar.formatted.size, NULL, 8);
 	file_header->mtime = strtol(tar.formatted.mtime, NULL, 8);
 	file_header->link_name = (tar.formatted.linkname[0] != '\0') ?
-	    bb_xstrdup(tar.formatted.linkname) : NULL;
+	    xstrdup(tar.formatted.linkname) : NULL;
 	file_header->device = makedev(strtol(tar.formatted.devmajor, NULL, 8),
 		strtol(tar.formatted.devminor, NULL, 8));