Ahem: add new faq entry to list at top of FAQ.html

[oweals/busybox.git] / archival / ar.c

diff --git a/archival/ar.c b/archival/ar.c
index b058b9ec150ec4d21d9bea7d0bf0d068c6ab0c67..8326aa6de6aa1a8d07aa0c0397665a2a23003ccb 100644 (file)
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -50,24 +50,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;
+       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");
+       opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
 
-       if ((opt & 0x80000000UL) || (optind == argc)) {
+       if ((opt & BB_GETOPT_ERROR) || (opt == 0) || (optind == argc)) {
                bb_show_usage();
        }
 
@@ -86,6 +89,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);