22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
298 lines
8.4 KiB
C
298 lines
8.4 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini ar implementation for busybox
|
|
*
|
|
* Copyright (C) 2000 by Glenn McGrath
|
|
*
|
|
* Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*
|
|
* Archive creation support:
|
|
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
|
|
* Written by Alexander Shishkin.
|
|
*
|
|
* There is no single standard to adhere to so ar may not portable
|
|
* between different systems
|
|
* http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
|
|
*/
|
|
|
|
//config:config AR
|
|
//config: bool "ar (9.5 kb)"
|
|
//config: default n # needs to be improved to be able to replace binutils ar
|
|
//config: help
|
|
//config: ar is an archival utility program used to create, modify, and
|
|
//config: extract contents from archives. In practice, it is used exclusively
|
|
//config: for object module archives used by compilers.
|
|
//config:
|
|
//config: Unless you have a specific application which requires ar, you should
|
|
//config: probably say N here: most compilers come with their own ar utility.
|
|
//config:
|
|
//config:config FEATURE_AR_LONG_FILENAMES
|
|
//config: bool "Support long filenames (not needed for debs)"
|
|
//config: default y
|
|
//config: depends on AR
|
|
//config: help
|
|
//config: By default the ar format can only store the first 15 characters
|
|
//config: of the filename, this option removes that limitation.
|
|
//config: It supports the GNU ar long filename method which moves multiple long
|
|
//config: filenames into a the data section of a new ar entry.
|
|
//config:
|
|
//config:config FEATURE_AR_CREATE
|
|
//config: bool "Support archive creation"
|
|
//config: default y
|
|
//config: depends on AR
|
|
//config: help
|
|
//config: This enables archive creation (-c and -r) with busybox ar.
|
|
|
|
//applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
//kbuild:lib-$(CONFIG_AR) += ar.o
|
|
|
|
//usage:#define ar_trivial_usage
|
|
//usage: "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
|
|
//usage:#define ar_full_usage "\n\n"
|
|
//usage: "Extract or list FILES from an ar archive\n"
|
|
//usage: "\n -o Preserve original dates"
|
|
//usage: "\n -p Extract to stdout"
|
|
//usage: "\n -t List"
|
|
//usage: "\n -x Extract"
|
|
//usage: "\n -v Verbose"
|
|
|
|
#include "libbb.h"
|
|
#include "bb_archive.h"
|
|
#include "ar.h"
|
|
|
|
#if ENABLE_FEATURE_AR_CREATE
|
|
/* filter out entries with same names as specified on the command line */
|
|
static char FAST_FUNC filter_replaceable(archive_handle_t *handle)
|
|
{
|
|
if (find_list_entry(handle->accept, handle->file_header->name))
|
|
return EXIT_FAILURE;
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
static void output_ar_header(archive_handle_t *handle)
|
|
{
|
|
/* GNU ar 2.19.51.0.14 creates malformed archives
|
|
* if input files are >10G. It also truncates files >4GB
|
|
* (uses "size mod 4G"). We abort in this case:
|
|
* We could add support for up to 10G files, but this is unlikely to be useful.
|
|
* Note that unpacking side limits all fields to "unsigned int" data type,
|
|
* and treats "all ones" as an error indicator. Thus max we allow here is UINT_MAX-1.
|
|
*/
|
|
enum {
|
|
/* for 2nd field: mtime */
|
|
MAX11CHARS = UINT_MAX > 0xffffffff ? (unsigned)99999999999 : UINT_MAX-1,
|
|
/* for last field: filesize */
|
|
MAX10CHARS = UINT_MAX > 0xffffffff ? (unsigned)9999999999 : UINT_MAX-1,
|
|
};
|
|
|
|
struct file_header_t *fh = handle->file_header;
|
|
|
|
if (handle->offset & 1) {
|
|
xwrite(handle->src_fd, "\n", 1);
|
|
handle->offset++;
|
|
}
|
|
|
|
/* Careful! The widths should be exact. Fields must be separated */
|
|
if (sizeof(off_t) > 4 && fh->size > (off_t)MAX10CHARS) {
|
|
bb_error_msg_and_die("'%s' is bigger than ar can handle", fh->name);
|
|
}
|
|
fdprintf(handle->src_fd, "%-16.16s%-12lu%-6u%-6u%-8o%-10"OFF_FMT"u`\n",
|
|
fh->name,
|
|
(sizeof(time_t) > 4 && fh->mtime > MAX11CHARS) ? (long)0 : (long)fh->mtime,
|
|
fh->uid > 99999 ? 0 : (int)fh->uid,
|
|
fh->gid > 99999 ? 0 : (int)fh->gid,
|
|
(int)fh->mode & 07777777,
|
|
fh->size
|
|
);
|
|
|
|
handle->offset += AR_HEADER_LEN;
|
|
}
|
|
|
|
/*
|
|
* when replacing files in an existing archive, copy from the
|
|
* original archive those files that are to be left intact
|
|
*/
|
|
static void FAST_FUNC copy_data(archive_handle_t *handle)
|
|
{
|
|
archive_handle_t *out_handle = handle->ar__out;
|
|
struct file_header_t *fh = handle->file_header;
|
|
|
|
out_handle->file_header = fh;
|
|
output_ar_header(out_handle);
|
|
|
|
bb_copyfd_exact_size(handle->src_fd, out_handle->src_fd, fh->size);
|
|
out_handle->offset += fh->size;
|
|
}
|
|
|
|
static int write_ar_header(archive_handle_t *handle)
|
|
{
|
|
char *fn;
|
|
char fn_h[17]; /* 15 + "/" + NUL */
|
|
struct stat st;
|
|
int fd;
|
|
|
|
fn = llist_pop(&handle->accept);
|
|
if (!fn)
|
|
return -1;
|
|
|
|
xstat(fn, &st);
|
|
|
|
handle->file_header->mtime = st.st_mtime;
|
|
handle->file_header->uid = st.st_uid;
|
|
handle->file_header->gid = st.st_gid;
|
|
handle->file_header->mode = st.st_mode;
|
|
handle->file_header->size = st.st_size;
|
|
handle->file_header->name = fn_h;
|
|
//TODO: if ENABLE_FEATURE_AR_LONG_FILENAMES...
|
|
sprintf(fn_h, "%.15s/", bb_basename(fn));
|
|
|
|
output_ar_header(handle);
|
|
|
|
fd = xopen(fn, O_RDONLY);
|
|
bb_copyfd_exact_size(fd, handle->src_fd, st.st_size);
|
|
close(fd);
|
|
handle->offset += st.st_size;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int write_ar_archive(archive_handle_t *handle)
|
|
{
|
|
struct stat st;
|
|
archive_handle_t *out_handle;
|
|
|
|
xfstat(handle->src_fd, &st, handle->ar__name);
|
|
|
|
/* if archive exists, create a new handle for output.
|
|
* we create it in place of the old one.
|
|
*/
|
|
if (st.st_size != 0) {
|
|
out_handle = init_handle();
|
|
xunlink(handle->ar__name);
|
|
out_handle->src_fd = xopen(handle->ar__name, O_WRONLY | O_CREAT | O_TRUNC);
|
|
out_handle->accept = handle->accept;
|
|
} else {
|
|
out_handle = handle;
|
|
}
|
|
|
|
handle->ar__out = out_handle;
|
|
|
|
xwrite(out_handle->src_fd, AR_MAGIC "\n", AR_MAGIC_LEN + 1);
|
|
out_handle->offset += AR_MAGIC_LEN + 1;
|
|
|
|
/* skip to the end of the archive if we have to append stuff */
|
|
if (st.st_size != 0) {
|
|
handle->filter = filter_replaceable;
|
|
handle->action_data = copy_data;
|
|
unpack_ar_archive(handle);
|
|
}
|
|
|
|
while (write_ar_header(out_handle) == 0)
|
|
continue;
|
|
|
|
/* optional, since we exit right after we return */
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
close(handle->src_fd);
|
|
if (out_handle->src_fd != handle->src_fd)
|
|
close(out_handle->src_fd);
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|
|
#endif /* FEATURE_AR_CREATE */
|
|
|
|
static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
|
|
{
|
|
const char *mode = bb_mode_string(file_header->mode);
|
|
char *mtime;
|
|
|
|
mtime = ctime(&file_header->mtime);
|
|
mtime[16] = ' ';
|
|
memmove(&mtime[17], &mtime[20], 4);
|
|
mtime[21] = '\0';
|
|
printf("%s %u/%u%7"OFF_FMT"u %s %s\n", &mode[1],
|
|
(int)file_header->uid, (int)file_header->gid,
|
|
file_header->size,
|
|
&mtime[4], file_header->name
|
|
);
|
|
}
|
|
|
|
#define AR_OPT_VERBOSE (1 << 0)
|
|
#define AR_OPT_PRESERVE_DATE (1 << 1)
|
|
/* "ar r" implies create, but warns about it. c suppresses warning.
|
|
* bbox accepts but ignores it: */
|
|
#define AR_OPT_CREATE (1 << 2)
|
|
|
|
#define AR_CMD_PRINT (1 << 3)
|
|
#define FIRST_CMD AR_CMD_PRINT
|
|
#define AR_CMD_LIST (1 << 4)
|
|
#define AR_CMD_EXTRACT (1 << 5)
|
|
#define AR_CMD_INSERT (1 << 6)
|
|
|
|
int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int ar_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
archive_handle_t *archive_handle;
|
|
unsigned opt, t;
|
|
|
|
archive_handle = init_handle();
|
|
|
|
/* prepend '-' to the first argument if required */
|
|
if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
|
|
argv[1] = xasprintf("-%s", argv[1]);
|
|
opt = getopt32(argv, "^"
|
|
"voc""ptx"IF_FEATURE_AR_CREATE("r")
|
|
"\0"
|
|
/* -1: at least one arg is reqd */
|
|
/* one of p,t,x[,r] is required */
|
|
"-1:p:t:x"IF_FEATURE_AR_CREATE(":r")
|
|
);
|
|
argv += optind;
|
|
|
|
t = opt / FIRST_CMD;
|
|
if (t & (t-1)) /* more than one of p,t,x[,r] are specified */
|
|
bb_show_usage();
|
|
|
|
if (opt & AR_CMD_PRINT) {
|
|
archive_handle->action_data = data_extract_to_stdout;
|
|
}
|
|
if (opt & AR_CMD_LIST) {
|
|
archive_handle->action_header = header_list;
|
|
}
|
|
if (opt & AR_CMD_EXTRACT) {
|
|
archive_handle->action_data = data_extract_all;
|
|
}
|
|
if (opt & AR_OPT_PRESERVE_DATE) {
|
|
archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
|
|
}
|
|
if (opt & AR_OPT_VERBOSE) {
|
|
archive_handle->action_header = header_verbose_list_ar;
|
|
}
|
|
#if ENABLE_FEATURE_AR_CREATE
|
|
archive_handle->ar__name = *argv;
|
|
#endif
|
|
archive_handle->src_fd = xopen(*argv++,
|
|
(opt & AR_CMD_INSERT)
|
|
? O_RDWR | O_CREAT
|
|
: O_RDONLY
|
|
);
|
|
|
|
if (*argv)
|
|
archive_handle->filter = filter_accept_list;
|
|
while (*argv) {
|
|
llist_add_to_end(&archive_handle->accept, *argv++);
|
|
}
|
|
|
|
#if ENABLE_FEATURE_AR_CREATE
|
|
if (opt & AR_CMD_INSERT)
|
|
return write_ar_archive(archive_handle);
|
|
#endif
|
|
|
|
unpack_ar_archive(archive_handle);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|