[BusyBox-cvs] busybox/archival/libunarchive archive_copy_file.c,1.3,1.4 archive_xread.c,1.1,1.2 archive_xread_all.c,1.1,1.2 archive_xread_all_eof.c,1.1,1.2 check_header_gzip.c,1.3,1.4 data_extract_all.c,1.8,1.9 decompress_bunzip2.c,1.3,1.4 get_header_ar.c,1.5,1.6 get_header_cpio.c,1.6,1.7 get_header_tar.c,1.16,1.17 get_header_tar_gz.c,1.5,1.6 header_verbose_list.c,1.1,1.2 seek_by_jump.c,1.2,1.3 uncompress.c,1.6,1.7 unpack_ar_archive.c,1.2,1.3 unzip.c,1.29,1.30
Manuel Novoa III
mjn3 at busybox.net
Wed Mar 19 09:13:51 UTC 2003
- Previous message: [BusyBox-cvs] busybox/miscutils adjtimex.c,1.3,1.4 crond.c,1.2,1.3 crontab.c,1.3,1.4 dc.c,1.14,1.15 dutmp.c,1.29,1.30 makedevs.c,1.14,1.15 mt.c,1.23,1.24 strings.c,1.6,1.7 time.c,1.3,1.4 update.c,1.23,1.24 watchdog.c,1.5,1.6
- Next message: [BusyBox-cvs] busybox/coreutils Config.in,1.2,1.3 basename.c,1.20,1.21 cal.c,1.4,1.5 cat.c,1.27,1.28 chgrp.c,1.11,1.12 chmod.c,1.13,1.14 chown.c,1.20,1.21 chroot.c,1.27,1.28 cmp.c,1.8,1.9 cp.c,1.20,1.21 cut.c,1.24,1.25 date.c,1.38,1.39 dd.c,1.52,1.53 df.c,1.49,1.50 dirname.c,1.17,1.18 dos2unix.c,1.16,1.17 du.c,1.55,1.56 echo.c,1.16,1.17 env.c,1.4,1.5 expr.c,1.11,1.12 false.c,1.1,1.2 head.c,1.28,1.29 hostid.c,1.12,1.13 id.c,1.21,1.22 length.c,1.13,1.14 ln.c,1.40,1.41 logname.c,1.16,1.17 ls.c,1.96,1.97 md5sum.c,1.27,1.28 mkdir.c,1.33,1.34 mkfifo.c,1.14,1.15 mknod.c,1.23,1.24 mv.c,1.17,1.18 od.c,1.4,1.5 printf.c,1.17,1.18 pwd.c,1.22,1.23 realpath.c,1.2,1.3 rm.c,1.35,1.36 rmdir.c,1.22,1.23 sha1sum.c,1.2,1.3 sleep.c,1.16,1.17 sort.c,1.34,1.35 stty.c,1.7,1.8 sync.c,1.18,1.19 tail.c,1.43,1.44 tee.c,1.21,1.22 test.c,1.21,1.22 touch.c,1.25,1.26 tr.c,1.33,1.34 true.c,1.1,1.2 tty.c,1.11,1.12 uname.c,1.18,1.19 uniq.c,1.20,1.21 usleep.c,1.10,1.11 uudecode.c,1.19,1.20 uuencode.c,1.24,1.25 watch.c,1.3,1.4 wc.c,1.26,1.27 who.c,1.1,1.2 whoami.c,1.20,1.21 yes.c,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/busybox/archival/libunarchive
In directory winder:/home/mjn3/work/busybox/archival/libunarchive
Modified Files:
archive_copy_file.c archive_xread.c archive_xread_all.c
archive_xread_all_eof.c check_header_gzip.c data_extract_all.c
decompress_bunzip2.c get_header_ar.c get_header_cpio.c
get_header_tar.c get_header_tar_gz.c header_verbose_list.c
seek_by_jump.c uncompress.c unpack_ar_archive.c unzip.c
Log Message:
Major coreutils update.
Index: archive_copy_file.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/archive_copy_file.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- archive_copy_file.c 15 Nov 2002 21:58:30 -0000 1.3
+++ archive_copy_file.c 19 Mar 2003 09:11:25 -0000 1.4
@@ -35,7 +35,7 @@
size = archive_xread(archive_handle, buffer, size);
if (write(dst_fd, buffer, size) != size) {
- error_msg_and_die ("Short write");
+ bb_error_msg_and_die ("Short write");
}
chunksize -= size;
}
Index: archive_xread.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/archive_xread.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- archive_xread.c 3 Nov 2002 14:05:07 -0000 1.1
+++ archive_xread.c 19 Mar 2003 09:11:25 -0000 1.2
@@ -26,7 +26,7 @@
size = archive_handle->read(archive_handle->src_fd, buf, count);
if (size == -1) {
- perror_msg_and_die("Read error");
+ bb_perror_msg_and_die("Read error");
}
return(size);
Index: archive_xread_all.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/archive_xread_all.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- archive_xread_all.c 3 Nov 2002 14:05:07 -0000 1.1
+++ archive_xread_all.c 19 Mar 2003 09:11:25 -0000 1.2
@@ -26,7 +26,7 @@
size = archive_xread(archive_handle, buf, count);
if (size != count) {
- error_msg_and_die("Short read");
+ bb_error_msg_and_die("Short read");
}
return;
}
Index: archive_xread_all_eof.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/archive_xread_all_eof.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- archive_xread_all_eof.c 3 Nov 2002 14:05:07 -0000 1.1
+++ archive_xread_all_eof.c 19 Mar 2003 09:11:25 -0000 1.2
@@ -26,7 +26,7 @@
size = archive_xread(archive_handle, buf, count);
if ((size != 0) && (size != count)) {
- perror_msg_and_die("Short read, read %d of %d", size, count);
+ bb_perror_msg_and_die("Short read, read %d of %d", size, count);
}
return(size);
}
Index: check_header_gzip.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/check_header_gzip.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- check_header_gzip.c 3 Nov 2002 10:57:25 -0000 1.3
+++ check_header_gzip.c 19 Mar 2003 09:11:25 -0000 1.4
@@ -15,11 +15,11 @@
} 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 @@
/* 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 @@
/* 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;
Index: data_extract_all.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/data_extract_all.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- data_extract_all.c 28 Jan 2003 01:45:48 -0000 1.8
+++ data_extract_all.c 19 Mar 2003 09:11:25 -0000 1.9
@@ -34,8 +34,8 @@
int res;
if (archive_handle->flags & ARCHIVE_CREATE_LEADING_DIRS) {
- char *name = xstrdup(file_header->name);
- make_directory (dirname(name), 0777, FILEUTILS_RECUR);
+ char *name = bb_xstrdup(file_header->name);
+ bb_make_directory (dirname(name), 0777, FILEUTILS_RECUR);
free(name);
}
@@ -47,13 +47,13 @@
/* hard link */
res = link(file_header->link_name, file_header->name);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
- perror_msg("Couldnt create hard link");
+ bb_perror_msg("Couldnt create hard link");
}
} else
#endif
{
/* Regular file */
- dst_fd = xopen(file_header->name, O_WRONLY | O_CREAT);
+ dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT);
archive_copy_file(archive_handle, dst_fd);
close(dst_fd);
}
@@ -63,7 +63,7 @@
unlink(file_header->name);
res = mkdir(file_header->name, file_header->mode);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
- perror_msg("extract_archive: %s", file_header->name);
+ bb_perror_msg("extract_archive: %s", file_header->name);
}
break;
case S_IFLNK:
@@ -71,7 +71,7 @@
unlink(file_header->name);
res = symlink(file_header->link_name, file_header->name);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
- perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name);
+ bb_perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name);
}
break;
case S_IFSOCK:
@@ -81,11 +81,11 @@
unlink(file_header->name);
res = mknod(file_header->name, file_header->mode, file_header->device);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
- perror_msg("Cannot create node %s", file_header->name);
+ bb_perror_msg("Cannot create node %s", file_header->name);
}
break;
default:
- error_msg_and_die("Unrecognised file type");
+ bb_error_msg_and_die("Unrecognised file type");
}
chmod(file_header->name, file_header->mode);
Index: decompress_bunzip2.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/decompress_bunzip2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- decompress_bunzip2.c 5 Nov 2002 02:56:53 -0000 1.3
+++ decompress_bunzip2.c 19 Mar 2003 09:11:25 -0000 1.4
@@ -1548,7 +1548,7 @@
while (1) {
if (bzf->strm.avail_in == 0) {
- n = xread(bzf->fd, bzf->buf, BZ_MAX_UNUSED);
+ n = bb_xread(bzf->fd, bzf->buf, BZ_MAX_UNUSED);
if (n == 0) {
break;
}
@@ -1560,7 +1560,7 @@
ret = BZ2_bzDecompress(&(bzf->strm));
if ((ret != BZ_OK) && (ret != BZ_STREAM_END)) {
- error_msg_and_die("Error decompressing");
+ bb_error_msg_and_die("Error decompressing");
}
if (ret == BZ_STREAM_END) {
@@ -1628,12 +1628,12 @@
while (bzerr == BZ_OK) {
nread = read_bz2(src_fd, obuf, 5000);
if (bzerr == BZ_DATA_ERROR_MAGIC) {
- error_msg_and_die("invalid magic");
+ bb_error_msg_and_die("invalid magic");
}
if (((bzerr == BZ_OK) || (bzerr == BZ_STREAM_END)) && (nread > 0)) {
if (write(dst_fd, obuf, nread) != nread) {
BZ2_bzReadClose();
- perror_msg_and_die("Couldnt write to file");
+ bb_perror_msg_and_die("Couldnt write to file");
}
}
}
Index: get_header_ar.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_ar.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- get_header_ar.c 4 Nov 2002 23:47:30 -0000 1.5
+++ get_header_ar.c 19 Mar 2003 09:11:25 -0000 1.6
@@ -41,7 +41,7 @@
static unsigned int ar_long_name_size;
#endif
- /* dont use xread as we want to handle the error ourself */
+ /* dont use bb_xread as we want to handle the error ourself */
if (read(archive_handle->src_fd, ar.raw, 60) != 60) {
/* End Of File */
return(EXIT_FAILURE);
@@ -51,14 +51,14 @@
if (ar.raw[0] == '\n') {
/* fix up the header, we started reading 1 byte too early */
memmove(ar.raw, &ar.raw[1], 59);
- ar.raw[59] = xread_char(archive_handle->src_fd);
+ ar.raw[59] = bb_xread_char(archive_handle->src_fd);
archive_handle->offset++;
}
archive_handle->offset += 60;
/* align the headers based on the header magic */
if ((ar.formated.magic[0] != '`') || (ar.formated.magic[1] != '\n')) {
- error_msg_and_die("Invalid ar header");
+ bb_error_msg_and_die("Invalid ar header");
}
typed->mode = strtol(ar.formated.mode, NULL, 8);
@@ -76,7 +76,7 @@
* in static variable long_names for use in future entries */
ar_long_name_size = typed->size;
ar_long_names = xmalloc(ar_long_name_size);
- xread_all(archive_handle->src_fd, ar_long_names, ar_long_name_size);
+ bb_xread_all(archive_handle->src_fd, ar_long_names, ar_long_name_size);
archive_handle->offset += ar_long_name_size;
/* This ar entries data section only contained filenames for other records
* they are stored in the static ar_long_names for future reference */
@@ -90,16 +90,16 @@
(saved in variable long_name) that conatains the real filename */
const unsigned int long_offset = atoi(&ar.formated.name[1]);
if (long_offset >= ar_long_name_size) {
- error_msg_and_die("Cant resolve long filename");
+ bb_error_msg_and_die("Cant resolve long filename");
}
- typed->name = xstrdup(ar_long_names + long_offset);
+ typed->name = bb_xstrdup(ar_long_names + long_offset);
}
#else
- error_msg_and_die("long filenames not supported");
+ bb_error_msg_and_die("long filenames not supported");
#endif
} else {
/* short filenames */
- typed->name = xstrndup(ar.formated.name, 16);
+ typed->name = bb_xstrndup(ar.formated.name, 16);
}
typed->name[strcspn(typed->name, " /")] = '\0';
Index: get_header_cpio.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_cpio.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- get_header_cpio.c 11 Dec 2002 21:45:08 -0000 1.6
+++ get_header_cpio.c 19 Mar 2003 09:11:25 -0000 1.7
@@ -46,7 +46,7 @@
oldtmp = NULL;
while (tmp) {
- error_msg_and_die("need to fix this\n");
+ bb_error_msg_and_die("need to fix this\n");
if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
file_header = tmp->entry;
if (oldtmp) {
@@ -78,11 +78,11 @@
cpio_header[2],
cpio_header[3],
cpio_header[4]);
- error_msg_and_die("Unsupported cpio format");
+ bb_error_msg_and_die("Unsupported cpio format");
}
if ((cpio_header[5] != '1') && (cpio_header[5] != '2')) {
- error_msg_and_die("Unsupported cpio format, use newc or crc");
+ bb_error_msg_and_die("Unsupported cpio format, use newc or crc");
}
{
@@ -109,7 +109,7 @@
hardlinks_t *tmp = saved_hardlinks;
hardlinks_t *oldtmp = NULL;
while (tmp) {
- error_msg("%s not created: cannot resolve hardlink", tmp->entry->name);
+ bb_error_msg("%s not created: cannot resolve hardlink", tmp->entry->name);
oldtmp = tmp;
tmp = tmp->next;
free (oldtmp->entry->name);
@@ -142,13 +142,13 @@
pending_hardlinks = 1;
while (tmp) {
if (tmp->inode == inode) {
- tmp->entry->link_name = xstrdup(file_header->name);
+ tmp->entry->link_name = bb_xstrdup(file_header->name);
nlink--;
}
tmp = tmp->next;
}
if (nlink > 1) {
- error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?");
+ bb_error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?");
}
}
}
@@ -165,11 +165,11 @@
if ((archive_handle->flags & ARCHIVE_EXTRACT_UNCONDITIONAL) || (statbuf.st_mtime < file_header->mtime)) {
/* Remove file if flag set or its older than the file to be extracted */
if (unlink(file_header->name) == -1) {
- perror_msg_and_die("Couldnt remove old file");
+ bb_perror_msg_and_die("Couldnt remove old file");
}
} else {
if (! archive_handle->flags & ARCHIVE_EXTRACT_QUIET) {
- error_msg("%s not created: newer or same age file exists", file_header->name);
+ bb_error_msg("%s not created: newer or same age file exists", file_header->name);
}
extract_flag = FALSE;
}
Index: get_header_tar.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_tar.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- get_header_tar.c 28 Jan 2003 01:45:48 -0000 1.16
+++ get_header_tar.c 19 Mar 2003 09:11:25 -0000 1.17
@@ -75,7 +75,7 @@
#ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
if (strncmp(tar.formated.magic, "\0\0\0\0\0", 5) != 0)
#endif
- error_msg_and_die("Invalid tar magic");
+ bb_error_msg_and_die("Invalid tar magic");
}
/* Do checksum on headers */
for (i = 0; i < 148 ; i++) {
@@ -86,7 +86,7 @@
sum += tar.raw[i];
}
if (sum != strtol(tar.formated.chksum, NULL, 8)) {
- error_msg("Invalid tar header checksum");
+ bb_error_msg("Invalid tar header checksum");
return(EXIT_FAILURE);
}
@@ -116,7 +116,7 @@
file_header->size = strtol(tar.formated.size, NULL, 8);
file_header->mtime = strtol(tar.formated.mtime, NULL, 8);
file_header->link_name = (tar.formated.linkname[0] != '\0') ?
- xstrdup(tar.formated.linkname) : NULL;
+ bb_xstrdup(tar.formated.linkname) : NULL;
file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) +
strtol(tar.formated.devminor, NULL, 8));
@@ -129,7 +129,7 @@
file_header->mode |= S_IFREG;
break;
case '1':
- error_msg("Internal hard link not supported");
+ bb_error_msg("Internal hard link not supported");
break;
case '2':
file_header->mode |= S_IFLNK;
@@ -170,7 +170,7 @@
case 'N':
case 'S':
case 'V':
- error_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
+ bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
# endif
}
#endif
Index: get_header_tar_gz.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_tar_gz.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- get_header_tar_gz.c 19 Nov 2002 08:22:03 -0000 1.5
+++ get_header_tar_gz.c 19 Mar 2003 09:11:25 -0000 1.6
@@ -25,7 +25,7 @@
archive_xread_all(archive_handle, &magic, 2);
if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
- error_msg_and_die("Invalid gzip magic");
+ bb_error_msg_and_die("Invalid gzip magic");
}
check_header_gzip(archive_handle->src_fd);
Index: header_verbose_list.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/header_verbose_list.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- header_verbose_list.c 25 Sep 2002 02:47:42 -0000 1.1
+++ header_verbose_list.c 19 Mar 2003 09:11:25 -0000 1.2
@@ -9,7 +9,7 @@
struct tm *mtime = localtime(&file_header->mtime);
printf("%s %d/%d%10u %4u-%02u-%02u %02u:%02u:%02u %s",
- mode_string(file_header->mode),
+ bb_mode_string(file_header->mode),
file_header->uid,
file_header->gid,
(unsigned int) file_header->size,
Index: seek_by_jump.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/seek_by_jump.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- seek_by_jump.c 8 Nov 2002 08:07:38 -0000 1.2
+++ seek_by_jump.c 19 Mar 2003 09:11:25 -0000 1.3
@@ -30,6 +30,6 @@
seek_by_char(archive_handle, amount);
} else
#endif
- perror_msg_and_die("Seek failure");
+ bb_perror_msg_and_die("Seek failure");
}
}
Index: uncompress.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/uncompress.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- uncompress.c 28 Nov 2002 09:09:47 -0000 1.6
+++ uncompress.c 19 Mar 2003 09:11:25 -0000 1.7
@@ -121,14 +121,14 @@
insize = 0;
- inbuf[0] = xread_char(fd_in);
+ inbuf[0] = bb_xread_char(fd_in);
maxbits = inbuf[0] & BIT_MASK;
block_mode = inbuf[0] & BLOCK_MODE;
maxmaxcode = MAXCODE(maxbits);
if (maxbits > BITS) {
- error_msg("compressed with %d bits, can only handle %d bits", maxbits,
+ bb_error_msg("compressed with %d bits, can only handle %d bits", maxbits,
BITS);
return -1;
}
@@ -227,11 +227,11 @@
posbits -= n_bits;
p = &inbuf[posbits >> 3];
- error_msg
+ bb_error_msg
("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)",
insize, posbits, p[-1], p[0], p[1], p[2], p[3],
(posbits & 07));
- error_msg("uncompress: corrupt input");
+ bb_error_msg("uncompress: corrupt input");
return -1;
}
Index: unpack_ar_archive.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/unpack_ar_archive.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- unpack_ar_archive.c 3 Nov 2002 14:05:09 -0000 1.2
+++ unpack_ar_archive.c 19 Mar 2003 09:11:26 -0000 1.3
@@ -26,7 +26,7 @@
archive_xread_all(ar_archive, magic, 7);
if (strncmp(magic, "!<arch>", 7) != 0) {
- error_msg_and_die("Invalid ar magic");
+ bb_error_msg_and_die("Invalid ar magic");
}
ar_archive->offset += 7;
Index: unzip.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/unzip.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- unzip.c 9 Feb 2003 12:00:17 -0000 1.29
+++ unzip.c 19 Mar 2003 09:11:26 -0000 1.30
@@ -150,7 +150,7 @@
/* Leave the first 4 bytes empty so we can always unwind the bitbuffer
* to the front of the bytebuffer, leave 4 bytes free at end of tail
* so we can easily top up buffer in check_trailer_gzip() */
- bytebuffer_size = 4 + xread(gunzip_src_fd, &bytebuffer[4], BYTEBUFFER_MAX - 8);
+ bytebuffer_size = 4 + bb_xread(gunzip_src_fd, &bytebuffer[4], BYTEBUFFER_MAX - 8);
bytebuffer_offset = 4;
}
}
@@ -448,7 +448,7 @@
if ((e = (t = tl + ((unsigned) b & ml))->e) > 16)
do {
if (e == 99) {
- error_msg_and_die("inflate_codes error 1");;
+ bb_error_msg_and_die("inflate_codes error 1");;
}
b >>= t->b;
k -= t->b;
@@ -484,7 +484,7 @@
if ((e = (t = td + ((unsigned) b & md))->e) > 16)
do {
if (e == 99)
- error_msg_and_die("inflate_codes error 2");;
+ bb_error_msg_and_die("inflate_codes error 2");;
b >>= t->b;
k -= t->b;
e -= 16;
@@ -821,7 +821,7 @@
if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) {
if (i == 1) {
- error_msg_and_die("Incomplete literal tree");
+ bb_error_msg_and_die("Incomplete literal tree");
huft_free(tl);
}
return i; /* incomplete code set */
@@ -830,7 +830,7 @@
bd = dbits;
if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) {
if (i == 1) {
- error_msg_and_die("incomplete distance tree");
+ bb_error_msg_and_die("incomplete distance tree");
huft_free(td);
}
huft_free(tl);
@@ -846,7 +846,7 @@
}
default:
/* bad block type */
- error_msg_and_die("bad block type %d\n", t);
+ bb_error_msg_and_die("bad block type %d\n", t);
}
}
@@ -884,7 +884,7 @@
break;
case -2: ret = inflate_codes(0,0,0,0,0);
break;
- default: error_msg_and_die("inflate error %d", method);
+ default: bb_error_msg_and_die("inflate error %d", method);
}
if (ret == 1) {
@@ -975,16 +975,16 @@
ssize_t nread, nwrote;
GZ_gzReadOpen(in, 0, 0);
- while(1) { // Robbed from copyfd.c
+ while(1) { // Robbed from bb_copyfd.c
nread = read_gz(in, buf, sizeof(buf));
if (nread == 0) break; // no data to write
else if (nread == -1) {
- perror_msg("read");
+ bb_perror_msg("read");
return -1;
}
- nwrote = full_write(out, buf, nread);
+ nwrote = bb_full_write(out, buf, nread);
if (nwrote == -1) {
- perror_msg("write");
+ bb_perror_msg("write");
return -1;
}
}
@@ -998,9 +998,9 @@
GZ_gzReadOpen(in, 0, 0);
while(1) {
int ret = inflate_get_next_window();
- nwrote = full_write(out, gunzip_window, gunzip_outbuf_count);
+ nwrote = bb_full_write(out, gunzip_window, gunzip_outbuf_count);
if (nwrote == -1) {
- perror_msg("write");
+ bb_perror_msg("write");
return -1;
}
if (ret == 0) break;
@@ -1017,7 +1017,7 @@
/* top up the input buffer with the rest of the trailer */
count = bytebuffer_size - bytebuffer_offset;
if (count < 8) {
- xread_all(src_fd, &bytebuffer[bytebuffer_size], 8 - count);
+ bb_xread_all(src_fd, &bytebuffer[bytebuffer_size], 8 - count);
bytebuffer_size += 8 - count;
}
for (count = 0; count != 4; count++) {
@@ -1027,14 +1027,14 @@
/* Validate decompression - crc */
if (stored_crc != (gunzip_crc ^ 0xffffffffL)) {
- error_msg_and_die("crc error");
+ bb_error_msg_and_die("crc error");
}
/* Validate decompression - size */
if (gunzip_bytes_out !=
(bytebuffer[bytebuffer_offset] | (bytebuffer[bytebuffer_offset+1] << 8) |
(bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) {
- error_msg_and_die("Incorrect length, but crc is correct");
+ bb_error_msg_and_die("Incorrect length, but crc is correct");
}
}
- Previous message: [BusyBox-cvs] busybox/miscutils adjtimex.c,1.3,1.4 crond.c,1.2,1.3 crontab.c,1.3,1.4 dc.c,1.14,1.15 dutmp.c,1.29,1.30 makedevs.c,1.14,1.15 mt.c,1.23,1.24 strings.c,1.6,1.7 time.c,1.3,1.4 update.c,1.23,1.24 watchdog.c,1.5,1.6
- Next message: [BusyBox-cvs] busybox/coreutils Config.in,1.2,1.3 basename.c,1.20,1.21 cal.c,1.4,1.5 cat.c,1.27,1.28 chgrp.c,1.11,1.12 chmod.c,1.13,1.14 chown.c,1.20,1.21 chroot.c,1.27,1.28 cmp.c,1.8,1.9 cp.c,1.20,1.21 cut.c,1.24,1.25 date.c,1.38,1.39 dd.c,1.52,1.53 df.c,1.49,1.50 dirname.c,1.17,1.18 dos2unix.c,1.16,1.17 du.c,1.55,1.56 echo.c,1.16,1.17 env.c,1.4,1.5 expr.c,1.11,1.12 false.c,1.1,1.2 head.c,1.28,1.29 hostid.c,1.12,1.13 id.c,1.21,1.22 length.c,1.13,1.14 ln.c,1.40,1.41 logname.c,1.16,1.17 ls.c,1.96,1.97 md5sum.c,1.27,1.28 mkdir.c,1.33,1.34 mkfifo.c,1.14,1.15 mknod.c,1.23,1.24 mv.c,1.17,1.18 od.c,1.4,1.5 printf.c,1.17,1.18 pwd.c,1.22,1.23 realpath.c,1.2,1.3 rm.c,1.35,1.36 rmdir.c,1.22,1.23 sha1sum.c,1.2,1.3 sleep.c,1.16,1.17 sort.c,1.34,1.35 stty.c,1.7,1.8 sync.c,1.18,1.19 tail.c,1.43,1.44 tee.c,1.21,1.22 test.c,1.21,1.22 touch.c,1.25,1.26 tr.c,1.33,1.34 true.c,1.1,1.2 tty.c,1.11,1.12 uname.c,1.18,1.19 uniq.c,1.20,1.21 usleep.c,1.10,1.11 uudecode.c,1.19,1.20 uuencode.c,1.24,1.25 watch.c,1.3,1.4 wc.c,1.26,1.27 who.c,1.1,1.2 whoami.c,1.20,1.21 yes.c,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the busybox-cvs
mailing list