X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Far.c;h=983b5ae2cd8ef965fdb5af7f27737b369b0a3043;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=7359f49105f35ddeee2056bde4e8f3269f81f2a2;hpb=9aff9036035fbed074e8e711b96c5c934e668884;p=oweals%2Fbusybox.git

diff --git a/archival/ar.c b/archival/ar.c
index 7359f4910..983b5ae2c 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -1,10 +1,10 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini ar implementation for busybox 
+ * Mini ar implementation for busybox
  *
  * Copyright (C) 2000 by Glenn McGrath
- * Written by Glenn McGrath <bug1@optushome.com.au> 1 June 2000
- * 		
+ * Written by Glenn McGrath <bug1@iinet.net.au> 1 June 2000
+ *
  * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,69 +21,92 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * There is no single standard to adhere to so ar may not portable
+ * between different systems
+ * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
  */
+
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <getopt.h>
+#include <string.h>
+#include <time.h>
+#include <utime.h>
 #include <unistd.h>
+
+#include "unarchive.h"
 #include "busybox.h"
 
+static void header_verbose_list_ar(const file_header_t *file_header)
+{
+	const char *mode = bb_mode_string(file_header->mode);
+	char *mtime;
+
+	mtime = ctime(&file_header->mtime);
+	mtime[16] = ' ';
+	memmove(&mtime[17], &mtime[20], 4);
+	mtime[21] = '\0';
+	printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid, (int) file_header->size, &mtime[4], file_header->name);
+}
+
+#define AR_CTX_PRINT		0x01
+#define AR_CTX_LIST		0x02
+#define AR_CTX_EXTRACT		0x04
+#define AR_OPT_PRESERVE_DATE	0x08
+#define AR_OPT_VERBOSE		0x10
+#define AR_OPT_CREATE		0x20
+#define AR_OPT_INSERT		0x40
+
 extern int ar_main(int argc, char **argv)
 {
-	FILE *src_stream = NULL;
-	int extract_function = 0, opt = 0;
-	file_headers_t *head;
-	file_headers_t *ar_extract_list = NULL;
+	archive_handle_t *archive_handle;
+	unsigned long opt;
+	static const char msg_unsupported_err[] = 
+			"Archive %s not supported.  Install binutils 'ar'.";
+	char magic[8];
 
-	while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
-		switch (opt) {
-		case 'o':
-			extract_function |= extract_preserve_date;
-			break;
-		case 'v':
-			extract_function |= extract_verbose_list;
-			break;
-		case 't':
-			extract_function |= extract_list;
-			break;
-		case 'p':
-			extract_function |= extract_to_stdout;
-			break;
-		case 'x':
-			extract_function |= extract_all_to_fs;
-			break;
-		default:
-			show_usage();
-		}
+	archive_handle = init_handle();
+	
+	/* Prepend '-' to the first argument if required */
+	bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt";
+	opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
+
+	if (opt & AR_CTX_PRINT) {
+		archive_handle->action_data = data_extract_to_stdout;
+	}
+	if (opt & AR_CTX_LIST) {
+		archive_handle->action_header = header_list;
+	}
+	if (opt & AR_CTX_EXTRACT) {
+		archive_handle->action_data = data_extract_all;
+	}
+	if (opt & AR_OPT_PRESERVE_DATE) {
+		archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
 	}
- 
-	/* check the src filename was specified */
-	if (optind == argc) {
-		show_usage();
+	if (opt & AR_OPT_VERBOSE) {
+		archive_handle->action_header = header_verbose_list_ar;
+	}
+	if (opt & AR_OPT_CREATE) {
+		bb_error_msg_and_die(msg_unsupported_err, "creation");
+	}
+	if (opt & AR_OPT_INSERT) {
+		bb_error_msg_and_die(msg_unsupported_err, "insertion");
 	}
 
-	src_stream = xfopen(argv[optind++], "r");
-	head = get_ar_headers(src_stream);
+	archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY);
 
-	/* find files to extract or display */
-	/* search through argv and build extract list */
-	ar_extract_list = (file_headers_t *) xcalloc(1, sizeof(file_headers_t));
-	if (optind < argc) {
-		while (optind < argc) {
-			ar_extract_list = add_from_archive_list(head, ar_extract_list, argv[optind]);
-			optind++;
-		}
-	} else {
-		ar_extract_list = head;
+	while (optind < argc) {
+		archive_handle->filter = filter_accept_list;
+		archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]);
 	}
 
-	/* If there isnt even one possible entry then abort */
-	if (ar_extract_list->name == NULL) {
-		error_msg_and_die("No files to extract");
-	}	
+	archive_xread_all(archive_handle, magic, 7);
+	if (strncmp(magic, "!<arch>", 7) != 0) {
+		bb_error_msg_and_die("Invalid ar magic");
+	}
+	archive_handle->offset += 7;
 
-	fseek(src_stream, 0, SEEK_SET);
-	extract_archive(src_stream, stdout, ar_extract_list, extract_function, "./");
+	while (get_header_ar(archive_handle) == EXIT_SUCCESS);
 
 	return EXIT_SUCCESS;
 }