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

Eliminated seeks so that we work correctly on pipes, and removed reliance on

Browse Source 
undefined evaluation ordering.  Thanks to Anthony Towns for explanation and
solution.
This commit is contained in:
Matt Kraai 2001-04-18 14:49:55 +00:00
parent bcfeb2ac44
commit b181056e06
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archival/libunarchive/decompress_unzip.c
View File

@ -904,6 +904,7 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
int method;
typedef void (*sig_type) (int);
int exit_code=0; /* program exit code */
int i;
in_file = l_in_file;
out_file = l_out_file;
@ -949,10 +950,16 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
flags = (unsigned char) fgetc(in_file);
/* Ignore time stamp(4), extra flags(1), OS type(1) */
fseek(in_file, 6, SEEK_CUR);
for (i = 0; i < 6; i++)
fgetc(in_file);
if ((flags & extra_field) != 0) {
fseek(in_file, (size_t) fgetc(in_file) + ((size_t)fgetc(in_file) << 8), SEEK_CUR);
size_t extra;
extra = fgetc(in_file);
extra += fgetc(in_file) << 8;
for (i = 0; i < extra; i++)
fgetc(in_file);
}
/* Discard original name if any */

11
archival/libunarchive/unzip.c
View File

@ -904,6 +904,7 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
int method;
typedef void (*sig_type) (int);
int exit_code=0; /* program exit code */
int i;
in_file = l_in_file;
out_file = l_out_file;
@ -949,10 +950,16 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
flags = (unsigned char) fgetc(in_file);
/* Ignore time stamp(4), extra flags(1), OS type(1) */
fseek(in_file, 6, SEEK_CUR);
for (i = 0; i < 6; i++)
fgetc(in_file);
if ((flags & extra_field) != 0) {
fseek(in_file, (size_t) fgetc(in_file) + ((size_t)fgetc(in_file) << 8), SEEK_CUR);
size_t extra;
extra = fgetc(in_file);
extra += fgetc(in_file) << 8;
for (i = 0; i < extra; i++)
fgetc(in_file);
}
/* Discard original name if any */

11
libbb/unzip.c
View File

@ -904,6 +904,7 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
int method;
typedef void (*sig_type) (int);
int exit_code=0; /* program exit code */
int i;
in_file = l_in_file;
out_file = l_out_file;
@ -949,10 +950,16 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
flags = (unsigned char) fgetc(in_file);
/* Ignore time stamp(4), extra flags(1), OS type(1) */
fseek(in_file, 6, SEEK_CUR);
for (i = 0; i < 6; i++)
fgetc(in_file);
if ((flags & extra_field) != 0) {
fseek(in_file, (size_t) fgetc(in_file) + ((size_t)fgetc(in_file) << 8), SEEK_CUR);
size_t extra;
extra = fgetc(in_file);
extra += fgetc(in_file) << 8;
for (i = 0; i < extra; i++)
fgetc(in_file);
}
/* Discard original name if any */