diff options
| author | Rob Landley <rob@landley.net> | 2006-08-03 17:58:17 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-08-03 17:58:17 +0000 |
| commit | 86b4d64aa3f5ca4c2824a8948541b0e18dfe0a74 (patch) | |
| tree | b3002e01131f99581c1be3462b96b2f2c40408f4 /archival | |
| parent | 7478804b783619762a52a740037126ef8711acc2 (diff) | |
| download | busybox-86b4d64aa3f5ca4c2824a8948541b0e18dfe0a74.tar.gz | |
These should have been part of 15767 too.
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/cpio.c | 2 | ||||
| -rw-r--r-- | archival/gzip.c | 4 | ||||
| -rw-r--r-- | archival/tar.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index 3576c8456..48b688e79 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -67,7 +67,7 @@ int cpio_main(int argc, char **argv) } } if (cpio_filename) { /* CPIO_OPT_FILE */ - archive_handle->src_fd = bb_xopen(cpio_filename, O_RDONLY); + archive_handle->src_fd = xopen(cpio_filename, O_RDONLY); archive_handle->seek = seek_by_jump; } if (opt & CPIO_OPT_CREATE_LEADING_DIR) { diff --git a/archival/gzip.c b/archival/gzip.c index 486f78f88..0962a00a7 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -1187,7 +1187,7 @@ int gzip_main(int argc, char **argv) ALLOC(ush, tab_prefix, 1L << BITS); /* Initialise the CRC32 table */ - crc_32_tab = bb_crc32_filltable(0); + crc_32_tab = crc32_filltable(0); clear_bufs(); part_nb = 0; @@ -1209,7 +1209,7 @@ int gzip_main(int argc, char **argv) inFileNum = STDIN_FILENO; outFileNum = STDOUT_FILENO; } else { - inFileNum = bb_xopen3(argv[i], O_RDONLY, 0); + inFileNum = xopen3(argv[i], O_RDONLY, 0); if (fstat(inFileNum, &statBuf) < 0) bb_perror_msg_and_die("%s", argv[i]); time_stamp = statBuf.st_ctime; diff --git a/archival/tar.c b/archival/tar.c index 426176bd2..c49434713 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -541,7 +541,7 @@ static llist_t *append_file_list_to_list(llist_t *list) llist_t *newlist = NULL; while (cur) { - src_stream = bb_xfopen(cur->data, "r"); + src_stream = xfopen(cur->data, "r"); tmp = cur; cur = cur->link; free(tmp); @@ -824,12 +824,12 @@ int tar_main(int argc, char **argv) tar_handle->src_fd = fileno(tar_stream); tar_handle->seek = seek_by_char; } else { - tar_handle->src_fd = bb_xopen(tar_filename, flags); + tar_handle->src_fd = xopen(tar_filename, flags); } } if (base_dir) - bb_xchdir(base_dir); + xchdir(base_dir); /* create an archive */ if (ENABLE_FEATURE_TAR_CREATE && (opt & CTX_CREATE)) { |