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>
407 lines
10 KiB
C
407 lines
10 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini tail implementation for busybox
|
|
*
|
|
* Copyright (C) 2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
|
|
*
|
|
* Pretty much rewritten to fix numerous bugs and reduce realloc() calls.
|
|
* Bugs fixed (although I may have forgotten one or two... it was pretty bad)
|
|
* 1) mixing printf/write without fflush()ing stdout
|
|
* 2) no check that any open files are present
|
|
* 3) optstring had -q taking an arg
|
|
* 4) no error checking on write in some cases, and a warning even then
|
|
* 5) q and s interaction bug
|
|
* 6) no check for lseek error
|
|
* 7) lseek attempted when count==0 even if arg was +0 (from top)
|
|
*/
|
|
//config:config TAIL
|
|
//config: bool "tail (7.1 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: tail is used to print the last specified number of lines
|
|
//config: from files.
|
|
//config:
|
|
//config:config FEATURE_FANCY_TAIL
|
|
//config: bool "Enable -q, -s, -v, and -F options"
|
|
//config: default y
|
|
//config: depends on TAIL
|
|
//config: help
|
|
//config: These options are provided by GNU tail, but
|
|
//config: are not specified in the SUSv3 standard:
|
|
//config: -q Never output headers giving file names
|
|
//config: -s SEC Wait SEC seconds between reads with -f
|
|
//config: -v Always output headers giving file names
|
|
//config: -F Same as -f, but keep retrying
|
|
|
|
//applet:IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_TAIL) += tail.o
|
|
|
|
/* BB_AUDIT SUSv3 compliant (need fancy for -c) */
|
|
/* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */
|
|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/tail.html */
|
|
|
|
//usage:#define tail_trivial_usage
|
|
//usage: "[OPTIONS] [FILE]..."
|
|
//usage:#define tail_full_usage "\n\n"
|
|
//usage: "Print last 10 lines of each FILE (or stdin) to stdout.\n"
|
|
//usage: "With more than one FILE, precede each with a filename header.\n"
|
|
//usage: "\n -f Print data as file grows"
|
|
//usage: "\n -c [+]N[kbm] Print last N bytes"
|
|
//usage: "\n -n N[kbm] Print last N lines"
|
|
//usage: "\n -n +N[kbm] Start on Nth line and print the rest"
|
|
//usage: IF_FEATURE_FANCY_TAIL(
|
|
//usage: "\n -q Never print headers"
|
|
//usage: "\n -s SECONDS Wait SECONDS between reads with -f"
|
|
//usage: "\n -v Always print headers"
|
|
//usage: "\n -F Same as -f, but keep retrying"
|
|
//usage: "\n"
|
|
//usage: "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)."
|
|
//usage: )
|
|
//usage:
|
|
//usage:#define tail_example_usage
|
|
//usage: "$ tail -n 1 /etc/resolv.conf\n"
|
|
//usage: "nameserver 10.0.0.1\n"
|
|
|
|
#include "libbb.h"
|
|
#include "common_bufsiz.h"
|
|
|
|
struct globals {
|
|
bool from_top;
|
|
bool exitcode;
|
|
} FIX_ALIASING;
|
|
#define G (*(struct globals*)bb_common_bufsiz1)
|
|
#define INIT_G() do { setup_common_bufsiz(); } while (0)
|
|
|
|
static void tail_xprint_header(const char *fmt, const char *filename)
|
|
{
|
|
if (fdprintf(STDOUT_FILENO, fmt, filename) < 0)
|
|
bb_perror_nomsg_and_die();
|
|
}
|
|
|
|
static ssize_t tail_read(int fd, char *buf, size_t count)
|
|
{
|
|
ssize_t r;
|
|
|
|
r = full_read(fd, buf, count);
|
|
if (r < 0) {
|
|
bb_perror_msg(bb_msg_read_error);
|
|
G.exitcode = EXIT_FAILURE;
|
|
}
|
|
|
|
return r;
|
|
}
|
|
|
|
#define header_fmt_str "\n==> %s <==\n"
|
|
|
|
static unsigned eat_num(const char *p)
|
|
{
|
|
if (*p == '-')
|
|
p++;
|
|
else if (*p == '+') {
|
|
p++;
|
|
G.from_top = 1;
|
|
}
|
|
return xatou_sfx(p, bkm_suffixes);
|
|
}
|
|
|
|
int tail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int tail_main(int argc, char **argv)
|
|
{
|
|
unsigned count = 10;
|
|
unsigned sleep_period = 1;
|
|
const char *str_c, *str_n;
|
|
|
|
char *tailbuf;
|
|
size_t tailbufsize;
|
|
unsigned header_threshhold = 1;
|
|
unsigned nfiles;
|
|
int i, opt;
|
|
|
|
int *fds;
|
|
const char *fmt;
|
|
int prev_fd;
|
|
|
|
INIT_G();
|
|
|
|
#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
|
|
/* Allow legacy syntax of an initial numeric option without -n. */
|
|
if (argv[1] && (argv[1][0] == '+' || argv[1][0] == '-')
|
|
&& isdigit(argv[1][1])
|
|
) {
|
|
count = eat_num(argv[1]);
|
|
argv++;
|
|
argc--;
|
|
}
|
|
#endif
|
|
|
|
/* -s NUM, -F imlies -f */
|
|
opt = getopt32(argv, IF_FEATURE_FANCY_TAIL("^")
|
|
"fc:n:"IF_FEATURE_FANCY_TAIL("qs:+vF")
|
|
IF_FEATURE_FANCY_TAIL("\0" "Ff"),
|
|
&str_c, &str_n IF_FEATURE_FANCY_TAIL(,&sleep_period)
|
|
);
|
|
#define FOLLOW (opt & 0x1)
|
|
#define COUNT_BYTES (opt & 0x2)
|
|
//if (opt & 0x1) // -f
|
|
if (opt & 0x2) count = eat_num(str_c); // -c
|
|
if (opt & 0x4) count = eat_num(str_n); // -n
|
|
#if ENABLE_FEATURE_FANCY_TAIL
|
|
/* q: make it impossible for nfiles to be > header_threshhold */
|
|
if (opt & 0x8) header_threshhold = UINT_MAX; // -q
|
|
//if (opt & 0x10) // -s
|
|
if (opt & 0x20) header_threshhold = 0; // -v
|
|
# define FOLLOW_RETRY (opt & 0x40)
|
|
#else
|
|
# define FOLLOW_RETRY 0
|
|
#endif
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
/* open all the files */
|
|
fds = xmalloc(sizeof(fds[0]) * (argc + 1));
|
|
if (!argv[0]) {
|
|
struct stat statbuf;
|
|
|
|
if (fstat(STDIN_FILENO, &statbuf) == 0
|
|
&& S_ISFIFO(statbuf.st_mode)
|
|
) {
|
|
opt &= ~1; /* clear FOLLOW */
|
|
}
|
|
argv[0] = (char *) bb_msg_standard_input;
|
|
}
|
|
nfiles = i = 0;
|
|
do {
|
|
int fd = open_or_warn_stdin(argv[i]);
|
|
if (fd < 0 && !FOLLOW_RETRY) {
|
|
G.exitcode = EXIT_FAILURE;
|
|
continue;
|
|
}
|
|
fds[nfiles] = fd;
|
|
argv[nfiles++] = argv[i];
|
|
} while (++i < argc);
|
|
|
|
if (!nfiles)
|
|
bb_error_msg_and_die("no files");
|
|
|
|
/* prepare the buffer */
|
|
tailbufsize = BUFSIZ;
|
|
if (!G.from_top && COUNT_BYTES) {
|
|
if (tailbufsize < count + BUFSIZ) {
|
|
tailbufsize = count + BUFSIZ;
|
|
}
|
|
}
|
|
/* tail -c1024m REGULAR_FILE doesn't really need 1G mem block.
|
|
* (In fact, it doesn't need ANY memory). So delay allocation.
|
|
*/
|
|
tailbuf = NULL;
|
|
|
|
/* tail the files */
|
|
|
|
fmt = header_fmt_str + 1; /* skip leading newline in the header on the first output */
|
|
i = 0;
|
|
do {
|
|
char *buf;
|
|
int taillen;
|
|
int newlines_seen;
|
|
unsigned seen;
|
|
int nread;
|
|
int fd = fds[i];
|
|
|
|
if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
|
|
continue; /* may happen with -F */
|
|
|
|
if (nfiles > header_threshhold) {
|
|
tail_xprint_header(fmt, argv[i]);
|
|
fmt = header_fmt_str;
|
|
}
|
|
|
|
if (!G.from_top) {
|
|
off_t current = lseek(fd, 0, SEEK_END);
|
|
if (current > 0) {
|
|
unsigned off;
|
|
if (COUNT_BYTES) {
|
|
/* Optimizing count-bytes case if the file is seekable.
|
|
* Beware of backing up too far.
|
|
* Also we exclude files with size 0 (because of /proc/xxx) */
|
|
if (count == 0)
|
|
continue; /* showing zero bytes is easy :) */
|
|
current -= count;
|
|
if (current < 0)
|
|
current = 0;
|
|
xlseek(fd, current, SEEK_SET);
|
|
bb_copyfd_size(fd, STDOUT_FILENO, count);
|
|
continue;
|
|
}
|
|
#if 1 /* This is technically incorrect for *LONG* strings, but very useful */
|
|
/* Optimizing count-lines case if the file is seekable.
|
|
* We assume the lines are <64k.
|
|
* (Users complain that tail takes too long
|
|
* on multi-gigabyte files) */
|
|
off = (count | 0xf); /* for small counts, be more paranoid */
|
|
if (off > (INT_MAX / (64*1024)))
|
|
off = (INT_MAX / (64*1024));
|
|
current -= off * (64*1024);
|
|
if (current < 0)
|
|
current = 0;
|
|
xlseek(fd, current, SEEK_SET);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
if (!tailbuf)
|
|
tailbuf = xmalloc(tailbufsize);
|
|
|
|
buf = tailbuf;
|
|
taillen = 0;
|
|
/* "We saw 1st line/byte".
|
|
* Used only by +N code ("start from Nth", 1-based): */
|
|
seen = 1;
|
|
newlines_seen = 0;
|
|
while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
|
|
if (G.from_top) {
|
|
int nwrite = nread;
|
|
if (seen < count) {
|
|
/* We need to skip a few more bytes/lines */
|
|
if (COUNT_BYTES) {
|
|
nwrite -= (count - seen);
|
|
seen += nread;
|
|
} else {
|
|
char *s = buf;
|
|
do {
|
|
--nwrite;
|
|
if (*s++ == '\n' && ++seen == count) {
|
|
break;
|
|
}
|
|
} while (nwrite);
|
|
}
|
|
}
|
|
if (nwrite > 0)
|
|
xwrite(STDOUT_FILENO, buf + nread - nwrite, nwrite);
|
|
} else if (count) {
|
|
if (COUNT_BYTES) {
|
|
taillen += nread;
|
|
if (taillen > (int)count) {
|
|
memmove(tailbuf, tailbuf + taillen - count, count);
|
|
taillen = count;
|
|
}
|
|
} else {
|
|
int k = nread;
|
|
int newlines_in_buf = 0;
|
|
|
|
do { /* count '\n' in last read */
|
|
k--;
|
|
if (buf[k] == '\n') {
|
|
newlines_in_buf++;
|
|
}
|
|
} while (k);
|
|
|
|
if (newlines_seen + newlines_in_buf < (int)count) {
|
|
newlines_seen += newlines_in_buf;
|
|
taillen += nread;
|
|
} else {
|
|
int extra = (buf[nread-1] != '\n');
|
|
char *s;
|
|
|
|
k = newlines_seen + newlines_in_buf + extra - count;
|
|
s = tailbuf;
|
|
while (k) {
|
|
if (*s == '\n') {
|
|
k--;
|
|
}
|
|
s++;
|
|
}
|
|
taillen += nread - (s - tailbuf);
|
|
memmove(tailbuf, s, taillen);
|
|
newlines_seen = count - extra;
|
|
}
|
|
if (tailbufsize < (size_t)taillen + BUFSIZ) {
|
|
tailbufsize = taillen + BUFSIZ;
|
|
tailbuf = xrealloc(tailbuf, tailbufsize);
|
|
}
|
|
}
|
|
buf = tailbuf + taillen;
|
|
}
|
|
} /* while (tail_read() > 0) */
|
|
if (!G.from_top) {
|
|
xwrite(STDOUT_FILENO, tailbuf, taillen);
|
|
}
|
|
} while (++i < nfiles);
|
|
prev_fd = fds[i-1];
|
|
|
|
tailbuf = xrealloc(tailbuf, BUFSIZ);
|
|
|
|
fmt = NULL;
|
|
|
|
if (FOLLOW) while (1) {
|
|
sleep(sleep_period);
|
|
|
|
i = 0;
|
|
do {
|
|
int nread;
|
|
const char *filename = argv[i];
|
|
int fd = fds[i];
|
|
|
|
if (FOLLOW_RETRY) {
|
|
struct stat sbuf, fsbuf;
|
|
|
|
if (fd < 0
|
|
|| fstat(fd, &fsbuf) < 0
|
|
|| stat(filename, &sbuf) < 0
|
|
|| fsbuf.st_dev != sbuf.st_dev
|
|
|| fsbuf.st_ino != sbuf.st_ino
|
|
) {
|
|
int new_fd;
|
|
|
|
if (fd >= 0)
|
|
close(fd);
|
|
new_fd = open(filename, O_RDONLY);
|
|
if (new_fd >= 0) {
|
|
bb_error_msg("%s has %s; following end of new file",
|
|
filename, (fd < 0) ? "appeared" : "been replaced"
|
|
);
|
|
} else if (fd >= 0) {
|
|
bb_perror_msg("%s has become inaccessible", filename);
|
|
}
|
|
fds[i] = fd = new_fd;
|
|
}
|
|
}
|
|
if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
|
|
continue;
|
|
if (nfiles > header_threshhold) {
|
|
fmt = header_fmt_str;
|
|
}
|
|
for (;;) {
|
|
/* tail -f keeps following files even if they are truncated */
|
|
struct stat sbuf;
|
|
/* /proc files report zero st_size, don't lseek them */
|
|
if (fstat(fd, &sbuf) == 0 && sbuf.st_size > 0) {
|
|
off_t current = lseek(fd, 0, SEEK_CUR);
|
|
if (sbuf.st_size < current)
|
|
xlseek(fd, 0, SEEK_SET);
|
|
}
|
|
|
|
nread = tail_read(fd, tailbuf, BUFSIZ);
|
|
if (nread <= 0)
|
|
break;
|
|
if (fmt && (fd != prev_fd)) {
|
|
tail_xprint_header(fmt, filename);
|
|
fmt = NULL;
|
|
prev_fd = fd;
|
|
}
|
|
xwrite(STDOUT_FILENO, tailbuf, nread);
|
|
}
|
|
} while (++i < nfiles);
|
|
} /* while (1) */
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
free(fds);
|
|
free(tailbuf);
|
|
}
|
|
return G.exitcode;
|
|
}
|