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

diff --git a/archival/ar.c b/archival/ar.c
index 890e81fc5..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
@@ -27,7 +27,6 @@
  */
 
 #include <fcntl.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,26 +49,27 @@ static void header_verbose_list_ar(const file_header_t *file_header)
 	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	1
-#define AR_CTX_LIST		2
-#define AR_CTX_EXTRACT	4
-#define AR_OPT_PRESERVE_DATE	8
-#define AR_OPT_VERBOSE			16
+#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)
 {
 	archive_handle_t *archive_handle;
 	unsigned long opt;
+	static const char msg_unsupported_err[] = 
+			"Archive %s not supported.  Install binutils 'ar'.";
 	char magic[8];
 
 	archive_handle = init_handle();
-
-	bb_opt_complementaly = "p~tx:t~px:x~pt";
-	opt = bb_getopt_ulflags(argc, argv, "ptxov");
-
-	if ((opt & 0x80000000UL) || (optind == argc)) {
-		bb_show_usage();
-	}
+	
+	/* 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;
@@ -86,6 +86,12 @@ extern int ar_main(int argc, char **argv)
 	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");
+	}
 
 	archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY);