diff options
| author | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-07 11:34:50 +0000 |
|---|---|---|
| committer | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-07 11:34:50 +0000 |
| commit | f2b9f7ee4c3d0cb35fcf0350006c3d78fe596b76 (patch) | |
| tree | 8fb3ae7e00c4f47175d65c74711026d7d2db3ebf /archival | |
| parent | c7ffbc597ae0749b9e0cc4fb2f191292afe949e6 (diff) | |
| download | busybox-w32-f2b9f7ee4c3d0cb35fcf0350006c3d78fe596b76.tar.gz busybox-w32-f2b9f7ee4c3d0cb35fcf0350006c3d78fe596b76.tar.bz2 busybox-w32-f2b9f7ee4c3d0cb35fcf0350006c3d78fe596b76.zip | |
- remove superfluous C statements ";;" in decompress_unzip.c, dpkg_deb.c ifconfig.c
- gzip.c: see if O_NOFOLLOW is defined before using it, else take alternate path
closes bug #221 (partially; The rest will follow later).
git-svn-id: svn://busybox.net/trunk/busybox@11797 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/dpkg_deb.c | 2 | ||||
| -rw-r--r-- | archival/gzip.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/decompress_unzip.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 1e8bd8ad2..1ceaa60e0 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c | |||
| @@ -75,7 +75,7 @@ extern int dpkg_deb_main(int argc, char **argv) | |||
| 75 | * it should accept a second argument which specifies a | 75 | * it should accept a second argument which specifies a |
| 76 | * specific field to print */ | 76 | * specific field to print */ |
| 77 | ar_archive->accept = control_tar_llist; | 77 | ar_archive->accept = control_tar_llist; |
| 78 | tar_archive->accept = llist_add_to(NULL, "./control");; | 78 | tar_archive->accept = llist_add_to(NULL, "./control"); |
| 79 | tar_archive->filter = filter_accept_list; | 79 | tar_archive->filter = filter_accept_list; |
| 80 | tar_archive->action_data = data_extract_to_stdout; | 80 | tar_archive->action_data = data_extract_to_stdout; |
| 81 | } | 81 | } |
diff --git a/archival/gzip.c b/archival/gzip.c index 6cf4b395e..a527f0e40 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
| @@ -1270,7 +1270,7 @@ int gzip_main(int argc, char **argv) | |||
| 1270 | strcat(path, ".gz"); | 1270 | strcat(path, ".gz"); |
| 1271 | 1271 | ||
| 1272 | /* Open output file */ | 1272 | /* Open output file */ |
| 1273 | #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) | 1273 | #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) && defined O_NOFOLLOW |
| 1274 | outFileNum = | 1274 | outFileNum = |
| 1275 | open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); | 1275 | open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); |
| 1276 | #else | 1276 | #else |
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 9e327606e..e8767cef5 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
| @@ -442,7 +442,7 @@ static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_b | |||
| 442 | if ((e = (t = tl + ((unsigned) b & ml))->e) > 16) | 442 | if ((e = (t = tl + ((unsigned) b & ml))->e) > 16) |
| 443 | do { | 443 | do { |
| 444 | if (e == 99) { | 444 | if (e == 99) { |
| 445 | bb_error_msg_and_die("inflate_codes error 1");; | 445 | bb_error_msg_and_die("inflate_codes error 1"); |
| 446 | } | 446 | } |
| 447 | b >>= t->b; | 447 | b >>= t->b; |
| 448 | k -= t->b; | 448 | k -= t->b; |
| @@ -478,7 +478,7 @@ static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_b | |||
| 478 | if ((e = (t = td + ((unsigned) b & md))->e) > 16) | 478 | if ((e = (t = td + ((unsigned) b & md))->e) > 16) |
| 479 | do { | 479 | do { |
| 480 | if (e == 99) | 480 | if (e == 99) |
| 481 | bb_error_msg_and_die("inflate_codes error 2");; | 481 | bb_error_msg_and_die("inflate_codes error 2"); |
| 482 | b >>= t->b; | 482 | b >>= t->b; |
| 483 | k -= t->b; | 483 | k -= t->b; |
| 484 | e -= 16; | 484 | e -= 16; |