summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorMike Frysinger2005-05-09 21:51:41 +0000
committerMike Frysinger2005-05-09 21:51:41 +0000
commitae38d65e952b998e1dca4167b74fb0cf1f14a2a6 (patch)
treefd270ba5c1fd91e26f064eb43640730f80badc78 /archival
parent9dc93ac5612a5439d1be71a0224817f509141b81 (diff)
downloadbusybox-ae38d65e952b998e1dca4167b74fb0cf1f14a2a6.zip
busybox-ae38d65e952b998e1dca4167b74fb0cf1f14a2a6.tar.gz
abort if user passes -r or if they dont pass anything
Diffstat (limited to 'archival')
-rw-r--r--archival/ar.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 44c5db0..bbdf2fd 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -56,19 +56,21 @@ static void header_verbose_list_ar(const file_header_t *file_header)
#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,7 +90,10 @@ extern int ar_main(int argc, char **argv)
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);