aboutsummaryrefslogtreecommitdiff
path: root/archival/ar.c
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2001-07-14 08:49:53 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2001-07-14 08:49:53 +0000
commita868ec89e8272c0cdf27e062785c4b5c6dcf66c5 (patch)
treefe1823623d327a9954d6c09e57c9d42f4fb575b1 /archival/ar.c
parent58a5bd187dd69ed9ba761e8ea755fd9ff4e97ce6 (diff)
downloadbusybox-w32-a868ec89e8272c0cdf27e062785c4b5c6dcf66c5.tar.gz
busybox-w32-a868ec89e8272c0cdf27e062785c4b5c6dcf66c5.tar.bz2
busybox-w32-a868ec89e8272c0cdf27e062785c4b5c6dcf66c5.zip
Allow the unarchive() extract_list variable to be NULL, meaning extract all
Diffstat (limited to 'archival/ar.c')
-rw-r--r--archival/ar.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 2a764ff5e..7f3396c8c 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -70,17 +70,17 @@ extern int ar_main(int argc, char **argv)
70 70
71 /* check ar magic */ 71 /* check ar magic */
72 fread(ar_magic, 1, 8, src_stream); 72 fread(ar_magic, 1, 8, src_stream);
73 archive_offset = 8;
73 if (strncmp(ar_magic,"!<arch>",7) != 0) { 74 if (strncmp(ar_magic,"!<arch>",7) != 0) {
74 error_msg_and_die("invalid magic"); 75 error_msg_and_die("invalid magic");
75 } 76 }
76 archive_offset = 8;
77 77
78 extract_names = malloc(sizeof(char *)); 78 /* Create a list of files to extract */
79 extract_names[0] = NULL;
80 while (optind < argc) { 79 while (optind < argc) {
80 extract_names = xrealloc(extract_names, sizeof(char *) * (num_of_entries + 2));
81 extract_names[num_of_entries] = xstrdup(argv[optind]);
81 num_of_entries++; 82 num_of_entries++;
82 *extract_names = realloc(*extract_names, num_of_entries); 83 extract_names[num_of_entries] = NULL;
83 extract_names[num_of_entries - 1] = xstrdup(argv[optind]);
84 optind++; 84 optind++;
85 } 85 }
86 86