diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-07-30 07:30:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-30 07:30:26 +0000 |
| commit | 69024551bfd489e7dc3fd1f59f99f373fa642804 (patch) | |
| tree | bb407e0bb00f86288d06bf62c5f76d158fc6766f /archival/unzip.c | |
| parent | f7eaf5a012f78753d12e5081a700524c94ce92c3 (diff) | |
| download | busybox-w32-69024551bfd489e7dc3fd1f59f99f373fa642804.tar.gz busybox-w32-69024551bfd489e7dc3fd1f59f99f373fa642804.tar.bz2 busybox-w32-69024551bfd489e7dc3fd1f59f99f373fa642804.zip | |
rename the accept/reject names since accept overrides the accept() socket function
Diffstat (limited to 'archival/unzip.c')
| -rw-r--r-- | archival/unzip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archival/unzip.c b/archival/unzip.c index 05dbc72dd..d60cb4db4 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
| @@ -148,8 +148,8 @@ extern int unzip_main(int argc, char **argv) | |||
| 148 | unsigned int total_entries = 0; | 148 | unsigned int total_entries = 0; |
| 149 | int src_fd = -1, dst_fd = -1; | 149 | int src_fd = -1, dst_fd = -1; |
| 150 | char *src_fn = NULL, *dst_fn = NULL; | 150 | char *src_fn = NULL, *dst_fn = NULL; |
| 151 | llist_t *accept = NULL; | 151 | llist_t *zaccept = NULL; |
| 152 | llist_t *reject = NULL; | 152 | llist_t *zreject = NULL; |
| 153 | char *base_dir = NULL; | 153 | char *base_dir = NULL; |
| 154 | int i, opt, opt_range = 0, list_header_done = 0; | 154 | int i, opt, opt_range = 0, list_header_done = 0; |
| 155 | char key_buf[512]; | 155 | char key_buf[512]; |
| @@ -191,7 +191,7 @@ extern int unzip_main(int argc, char **argv) | |||
| 191 | 191 | ||
| 192 | case 1: /* Include files */ | 192 | case 1: /* Include files */ |
| 193 | if (opt == 1) { | 193 | if (opt == 1) { |
| 194 | accept = llist_add_to(accept, optarg); | 194 | zaccept = llist_add_to(zaccept, optarg); |
| 195 | 195 | ||
| 196 | } else if (opt == 'd') { | 196 | } else if (opt == 'd') { |
| 197 | base_dir = optarg; | 197 | base_dir = optarg; |
| @@ -207,7 +207,7 @@ extern int unzip_main(int argc, char **argv) | |||
| 207 | 207 | ||
| 208 | case 2 : /* Exclude files */ | 208 | case 2 : /* Exclude files */ |
| 209 | if (opt == 1) { | 209 | if (opt == 1) { |
| 210 | reject = llist_add_to(reject, optarg); | 210 | zreject = llist_add_to(zreject, optarg); |
| 211 | 211 | ||
| 212 | } else if (opt == 'd') { /* Extract to base directory */ | 212 | } else if (opt == 'd') { /* Extract to base directory */ |
| 213 | base_dir = optarg; | 213 | base_dir = optarg; |
| @@ -299,8 +299,8 @@ extern int unzip_main(int argc, char **argv) | |||
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | /* Filter zip entries */ | 301 | /* Filter zip entries */ |
| 302 | if (find_list_entry(reject, dst_fn) || | 302 | if (find_list_entry(zreject, dst_fn) || |
| 303 | (accept && !find_list_entry(accept, dst_fn))) { /* Skip entry */ | 303 | (zaccept && !find_list_entry(zaccept, dst_fn))) { /* Skip entry */ |
| 304 | i = 'n'; | 304 | i = 'n'; |
| 305 | 305 | ||
| 306 | } else { /* Extract entry */ | 306 | } else { /* Extract entry */ |