0b42a6a8c
Bernhard Reutner-Fischer
2005-10-07
Subject
- 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).
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/dpkg_deb.c +1 -1archival/gzip.c +1 -1archival/libunarchive/decompress_unzip.c +2 -2networking/ifconfig.c +1 -1
archival/dpkg_deb.c+1 -1
| @@ -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; | |
| } | |
archival/gzip.c+1 -1
| @@ -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 | |
archival/libunarchive/decompress_unzip.c+2 -2
| @@ -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; | |
networking/ifconfig.c+1 -1
| @@ -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. */ | |