Major coreutils update.

This commit is contained in:
Manuel Novoa III
2003-03-19 09:13:01 +00:00
parent e01f9662a5
commit cad5364599
295 changed files with 6944 additions and 5570 deletions

View File

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