projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge post-1.3.0 fixes
[oweals/busybox.git]
/
archival
/
libunarchive
/
check_header_gzip.c
diff --git
a/archival/libunarchive/check_header_gzip.c
b/archival/libunarchive/check_header_gzip.c
index 79477c610cdaa1e758a0f94d5b68b93c85b5c406..0cfa944540338c5a95720aef6de03075acc977c7 100644
(file)
--- a/
archival/libunarchive/check_header_gzip.c
+++ b/
archival/libunarchive/check_header_gzip.c
@@
-17,45
+17,45
@@
void check_header_gzip(int src_fd)
unsigned int mtime;
unsigned char xtra_flags;
unsigned char os_flags;
unsigned int mtime;
unsigned char xtra_flags;
unsigned char os_flags;
- } formated;
+ } format
t
ed;
} header;
} header;
-
bb_xread_all
(src_fd, header.raw, 8);
+
xread
(src_fd, header.raw, 8);
/* Check the compression method */
/* Check the compression method */
- if (header.formated.method != 8) {
- bb_error_msg_and_die("
U
nknown compression method %d",
- header.formated.method);
+ if (header.format
t
ed.method != 8) {
+ bb_error_msg_and_die("
u
nknown compression method %d",
+ header.format
t
ed.method);
}
}
- if (header.formated.flags & 0x04) {
+ if (header.format
t
ed.flags & 0x04) {
/* bit 2 set: extra field present */
unsigned char extra_short;
/* bit 2 set: extra field present */
unsigned char extra_short;
- extra_short =
bb_xread_char(src_fd) + (bb_
xread_char(src_fd) << 8);
+ extra_short =
xread_char(src_fd) + (
xread_char(src_fd) << 8);
while (extra_short > 0) {
/* Ignore extra field */
while (extra_short > 0) {
/* Ignore extra field */
-
bb_
xread_char(src_fd);
+ xread_char(src_fd);
extra_short--;
}
}
/* Discard original name if any */
extra_short--;
}
}
/* Discard original name if any */
- if (header.formated.flags & 0x08) {
+ if (header.format
t
ed.flags & 0x08) {
/* bit 3 set: original file name present */
/* bit 3 set: original file name present */
- while
(bb_
xread_char(src_fd) != 0);
+ while
(
xread_char(src_fd) != 0);
}
/* Discard file comment if any */
}
/* Discard file comment if any */
- if (header.formated.flags & 0x10) {
+ if (header.format
t
ed.flags & 0x10) {
/* bit 4 set: file comment present */
/* bit 4 set: file comment present */
- while
(bb_
xread_char(src_fd) != 0);
+ while
(
xread_char(src_fd) != 0);
}
/* Read the header checksum */
}
/* Read the header checksum */
- if (header.formated.flags & 0x02) {
-
bb_
xread_char(src_fd);
-
bb_
xread_char(src_fd);
+ if (header.format
t
ed.flags & 0x02) {
+ xread_char(src_fd);
+ xread_char(src_fd);
}
return;
}
return;