diff options
author | Manuel Novoa III | 2003-03-19 09:13:01 +0000 |
---|---|---|
committer | Manuel Novoa III | 2003-03-19 09:13:01 +0000 |
commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /archival/libunarchive/check_header_gzip.c | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) | |
download | busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.zip busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz |
Major coreutils update.
Diffstat (limited to 'archival/libunarchive/check_header_gzip.c')
-rw-r--r-- | archival/libunarchive/check_header_gzip.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c index d661df7..13832c2 100644 --- a/archival/libunarchive/check_header_gzip.c +++ b/archival/libunarchive/check_header_gzip.c @@ -15,11 +15,11 @@ extern void check_header_gzip(int src_fd) } formated; } header; - xread_all(src_fd, header.raw, 8); + bb_xread_all(src_fd, header.raw, 8); /* Check the compression method */ if (header.formated.method != 8) { - error_msg_and_die("Unknown compression method %d", + bb_error_msg_and_die("Unknown compression method %d", header.formated.method); } @@ -27,10 +27,10 @@ extern void check_header_gzip(int src_fd) /* bit 2 set: extra field present */ unsigned char extra_short; - extra_short = xread_char(src_fd) + (xread_char(src_fd) << 8); + extra_short = bb_xread_char(src_fd) + (bb_xread_char(src_fd) << 8); while (extra_short > 0) { /* Ignore extra field */ - xread_char(src_fd); + bb_xread_char(src_fd); extra_short--; } } @@ -38,19 +38,19 @@ extern void check_header_gzip(int src_fd) /* Discard original name if any */ if (header.formated.flags & 0x08) { /* bit 3 set: original file name present */ - while(xread_char(src_fd) != 0); + while(bb_xread_char(src_fd) != 0); } /* Discard file comment if any */ if (header.formated.flags & 0x10) { /* bit 4 set: file comment present */ - while(xread_char(src_fd) != 0); + while(bb_xread_char(src_fd) != 0); } /* Read the header checksum */ if (header.formated.flags & 0x02) { - xread_char(src_fd); - xread_char(src_fd); + bb_xread_char(src_fd); + bb_xread_char(src_fd); } return; |