emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename the accept/reject names since accept overrides the accept() socket function

Browse Source
This commit is contained in:
Mike Frysinger 2005-07-30 07:30:26 +00:00
parent f7eaf5a012
commit 69024551bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archival/unzip.c
View File

@ -148,8 +148,8 @@ extern int unzip_main(int argc, char **argv)
unsigned int total_entries = 0; unsigned int total_entries = 0;
int src_fd = -1, dst_fd = -1; int src_fd = -1, dst_fd = -1;
char *src_fn = NULL, *dst_fn = NULL; char *src_fn = NULL, *dst_fn = NULL;
llist_t *accept = NULL; llist_t *zaccept = NULL;
llist_t *reject = NULL; llist_t *zreject = NULL;
char *base_dir = NULL; char *base_dir = NULL;
int i, opt, opt_range = 0, list_header_done = 0; int i, opt, opt_range = 0, list_header_done = 0;
char key_buf[512]; char key_buf[512];
@ -191,7 +191,7 @@ extern int unzip_main(int argc, char **argv)
case 1: /* Include files */ case 1: /* Include files */
if (opt == 1) { if (opt == 1) {
accept = llist_add_to(accept, optarg); zaccept = llist_add_to(zaccept, optarg);
} else if (opt == 'd') { } else if (opt == 'd') {
base_dir = optarg; base_dir = optarg;
@ -207,7 +207,7 @@ extern int unzip_main(int argc, char **argv)
case 2 : /* Exclude files */ case 2 : /* Exclude files */
if (opt == 1) { if (opt == 1) {
reject = llist_add_to(reject, optarg); zreject = llist_add_to(zreject, optarg);
} else if (opt == 'd') { /* Extract to base directory */ } else if (opt == 'd') { /* Extract to base directory */
base_dir = optarg; base_dir = optarg;
@ -299,8 +299,8 @@ extern int unzip_main(int argc, char **argv)
} }
/* Filter zip entries */ /* Filter zip entries */
if (find_list_entry(reject, dst_fn) || if (find_list_entry(zreject, dst_fn) ||
(accept && !find_list_entry(accept, dst_fn))) { /* Skip entry */ (zaccept && !find_list_entry(zaccept, dst_fn))) { /* Skip entry */
i = 'n'; i = 'n';
} else { /* Extract entry */ } else { /* Extract entry */