diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-10-07 11:34:50 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-10-07 11:34:50 +0000 |
| commit | 0b42a6a8cf94dd05434cf5554449a6b19d47fb1e (patch) | |
| tree | 8fb3ae7e00c4f47175d65c74711026d7d2db3ebf | |
| parent | 4d63525f76fd783c8ef436996c1b6f1e29dc2945 (diff) | |
| download | busybox-0b42a6a8cf94dd05434cf5554449a6b19d47fb1e.tar.gz | |
- 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).
| -rw-r--r-- | archival/dpkg_deb.c | 2 | ||||
| -rw-r--r-- | archival/gzip.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/decompress_unzip.c | 4 | ||||
| -rw-r--r-- | networking/ifconfig.c | 2 |
4 files changed, 5 insertions, 5 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) * it should accept a second argument which specifies a * specific field to print */ ar_archive->accept = control_tar_llist; - tar_archive->accept = llist_add_to(NULL, "./control");; + tar_archive->accept = llist_add_to(NULL, "./control"); tar_archive->filter = filter_accept_list; tar_archive->action_data = data_extract_to_stdout; } 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) strcat(path, ".gz"); /* Open output file */ -#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) +#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) && defined O_NOFOLLOW outFileNum = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); #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 if ((e = (t = tl + ((unsigned) b & ml))->e) > 16) do { if (e == 99) { - bb_error_msg_and_die("inflate_codes error 1");; + bb_error_msg_and_die("inflate_codes error 1"); } b >>= t->b; k -= t->b; @@ -478,7 +478,7 @@ static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_b if ((e = (t = td + ((unsigned) b & md))->e) > 16) do { if (e == 99) - bb_error_msg_and_die("inflate_codes error 2");; + bb_error_msg_and_die("inflate_codes error 2"); b >>= t->b; k -= t->b; e -= 16; diff --git a/networking/ifconfig.c b/networking/ifconfig.c index b121eb9f3..eddf052e0 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -353,7 +353,7 @@ int ifconfig_main(int argc, char **argv) for (op = OptArray; op->name; op++) { /* Find table entry. */ if (strcmp(p, op->name) == 0) { /* If name matches... */ if ((mask &= op->flags)) { /* set the mask and go. */ - goto FOUND_ARG;; + goto FOUND_ARG; } /* If we get here, there was a valid arg with an */ /* invalid '-' prefix. */ |