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

Use xread_char to save a few bytes, fix indenting of comments

Browse Source
This commit is contained in:
Glenn L McGrath 2002-11-03 10:57:25 +00:00
parent 60bce4905c
commit 9c60b29071
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
archival/libunarchive/check_header_gzip.c
View File

@ -17,7 +17,7 @@ extern void check_header_gzip(int src_fd)
xread_all(src_fd, header.raw, 8); xread_all(src_fd, header.raw, 8);
/* Check the compression method */ /* Check the compression method */
if (header.formated.method != 8) { if (header.formated.method != 8) {
error_msg_and_die("Unknown compression method %d", error_msg_and_die("Unknown compression method %d",
header.formated.method); header.formated.method);
@ -27,41 +27,30 @@ extern void check_header_gzip(int src_fd)
/* bit 2 set: extra field present */ /* bit 2 set: extra field present */
unsigned char extra_short; unsigned char extra_short;
extra_short = xread_char(src_fd); extra_short = xread_char(src_fd) + (xread_char(src_fd) << 8);
extra_short += xread_char(src_fd) << 8;
while (extra_short > 0) { while (extra_short > 0) {
/* Ignore extra field */ /* Ignore extra field */
xread_char(src_fd); xread_char(src_fd);
extra_short--; extra_short--;
} }
} }
/* Discard original name if any */ /* Discard original name if any */
if (header.formated.flags & 0x08) { if (header.formated.flags & 0x08) {
/* bit 3 set: original file name present */ /* bit 3 set: original file name present */
char tmp; while(xread_char(src_fd) != 0);
do {
read(src_fd, &tmp, 1);
} while (tmp != 0);
} }
/* Discard file comment if any */ /* Discard file comment if any */
if (header.formated.flags & 0x10) { if (header.formated.flags & 0x10) {
/* bit 4 set: file comment present */ /* bit 4 set: file comment present */
char tmp; while(xread_char(src_fd) != 0);
do {
read(src_fd, &tmp, 1);
} while (tmp != 0);
} }
/* Read the header checksum */ /* Read the header checksum */
if (header.formated.flags & 0x02) { if (header.formated.flags & 0x02) {
char tmp; xread_char(src_fd);
xread_char(src_fd);
read(src_fd, &tmp, 1);
read(src_fd, &tmp, 1);
} }
return; return;