[BusyBox-cvs] svn commit: trunk/busybox/archival

[vapier at busybox.net]

Author: vapier
Date: 2005-05-09 15:51:41 -0600 (Mon, 09 May 2005)
New Revision: 10274

Log:
abort if user passes -r or if they dont pass anything

Modified:
   trunk/busybox/archival/ar.c


Changeset:
Modified: trunk/busybox/archival/ar.c
===================================================================
--- trunk/busybox/archival/ar.c	2005-05-09 21:51:15 UTC (rev 10273)
+++ trunk/busybox/archival/ar.c	2005-05-09 21:51:41 UTC (rev 10274)
@@ -56,19 +56,21 @@
 #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;
+	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, "ptxovc");
+	opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
 
-	if ((opt & 0x80000000UL) || (optind == argc)) {
+	if ((opt & 0x80000000UL) || (opt == 0) || (optind == argc)) {
 		bb_show_usage();
 	}
 
@@ -88,8 +90,11 @@
 		archive_handle->action_header = header_verbose_list_ar;
 	}
 	if (opt & AR_OPT_CREATE) {
-		bb_error_msg_and_die("Archive creation not supported.  Install binutils 'ar'.");
+		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);