emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use bb_getopt_ulflags, saves some space, better argument checking.

Browse Source 
Remove ar specific extraction code, always use common extraction code.
This commit is contained in:
Glenn L McGrath 2004-01-04 10:28:22 +00:00
parent 40ec4aeb8e
commit 930453bdcf
1 changed files with 32 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
archival/ar.c
View File

@ -21,20 +21,20 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* There is no signle standard to adhere to so ar may not portable * There is no single standard to adhere to so ar may not portable
* between different systems * between different systems
* http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
*/ */
#include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <fnmatch.h> #include <getopt.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <utime.h> #include <utime.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h>
#include "unarchive.h" #include "unarchive.h"
#include "busybox.h" #include "busybox.h"
@ -50,87 +50,50 @@ static void header_verbose_list_ar(const file_header_t *file_header)
printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid, (int) file_header->size, &mtime[4], file_header->name); printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid, (int) file_header->size, &mtime[4], file_header->name);
} }
#if !defined CONFIG_TAR && !defined CONFIG_DPKG_DEB && !defined CONFIG_CPIO #define AR_CTX_PRINT 1
/* This is simpler than data_extract_all */ #define AR_CTX_LIST 2
static void data_extract_regular_file(archive_handle_t *archive_handle) #define AR_CTX_EXTRACT 4
{ #define AR_OPT_PRESERVE_DATE 8
file_header_t *file_header; #define AR_OPT_VERBOSE 16
int dst_fd;
file_header = archive_handle->file_header;
dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT);
bb_copyfd_size(archive_handle->src_fd, dst_fd, file_header->size);
close(dst_fd);
chmod(file_header->name, file_header->mode);
chown(file_header->name, file_header->uid, file_header->gid);
if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) {
struct utimbuf t;
t.actime = t.modtime = file_header->mtime;
utime(file_header->name, &t);
}
return;
}
#endif
extern int ar_main(int argc, char **argv) extern int ar_main(int argc, char **argv)
{ {
archive_handle_t *archive_handle; archive_handle_t *archive_handle;
int opt; unsigned long opt;
#if !defined CONFIG_DPKG_DEB && !defined CONFIG_DPKG
char magic[8]; char magic[8];
#endif
archive_handle = init_handle(); archive_handle = init_handle();
while ((opt = getopt(argc, argv, "covtpxX")) != -1) { bb_opt_complementaly = "p~tx:t~px:x~pt";
switch (opt) { opt = bb_getopt_ulflags(argc, argv, "ptxov");
case 'p': /* print */
archive_handle->action_data = data_extract_to_stdout; if ((opt & 0x80000000UL) || (optind == argc)) {
break;
case 't': /* list contents */
archive_handle->action_header = header_list;
break;
case 'X':
archive_handle->action_header = header_verbose_list_ar;
case 'x': /* extract */
#if defined CONFIG_TAR || defined CONFIG_DPKG_DEB || defined CONFIG_CPIO
archive_handle->action_data = data_extract_all;
#else
archive_handle->action_data = data_extract_regular_file;
#endif
break;
/* Modifiers */
case 'o': /* preserve original dates */
archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
break;
case 'v': /* verbose */
archive_handle->action_header = header_verbose_list_ar;
break;
default:
bb_show_usage();
}
}
/* check the src filename was specified */
if (optind == argc) {
bb_show_usage(); bb_show_usage();
} }
if (opt & AR_CTX_PRINT) {
archive_handle->action_data = data_extract_to_stdout;
}
if (opt & AR_CTX_LIST) {
archive_handle->action_header = header_list;
}
if (opt & AR_CTX_EXTRACT) {
archive_handle->action_data = data_extract_all;
}
if (opt & AR_OPT_PRESERVE_DATE) {
archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
}
if (opt & AR_OPT_VERBOSE) {
archive_handle->action_header = header_verbose_list_ar;
}
archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY);
/* TODO: This is the same as in tar, seperate function ? */
while (optind < argc) { while (optind < argc) {
archive_handle->filter = filter_accept_list; archive_handle->filter = filter_accept_list;
archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind]); archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]);
optind++;
} }
#if defined CONFIG_DPKG_DEB || defined CONFIG_DPKG
unpack_ar_archive(archive_handle);
#else
archive_xread_all(archive_handle, magic, 7); archive_xread_all(archive_handle, magic, 7);
if (strncmp(magic, "!<arch>", 7) != 0) { if (strncmp(magic, "!<arch>", 7) != 0) {
bb_error_msg_and_die("Invalid ar magic"); bb_error_msg_and_die("Invalid ar magic");
@ -138,7 +101,6 @@ extern int ar_main(int argc, char **argv)
archive_handle->offset += 7; archive_handle->offset += 7;
while (get_header_ar(archive_handle) == EXIT_SUCCESS); while (get_header_ar(archive_handle) == EXIT_SUCCESS);
#endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }