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

- remove superfluous C statements ";;" in decompress_unzip.c, dpkg_deb.c ifconfig.c

Browse Source 
- gzip.c: see if O_NOFOLLOW is defined before using it, else take alternate path
closes bug #221 (partially; The rest will follow later).
This commit is contained in:
Bernhard Reutner-Fischer 2005-10-07 11:34:50 +00:00
parent 4d63525f76
commit 0b42a6a8cf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/dpkg_deb.c
View File

@ -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;
}

2
archival/gzip.c
View File

@ -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

4
archival/libunarchive/decompress_unzip.c
View File

@ -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;

2
networking/ifconfig.c
View File

@ -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. */