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

tail: fix fallout from tail -c optimization

Browse Source
This commit is contained in:
Denis Vlasenko 2008-03-23 03:28:40 +00:00
parent c8bac033f3
commit 69ca5a70fd
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coreutils/tail.c
View File

@ -163,8 +163,6 @@ int tail_main(int argc, char **argv)
fmt = header_fmt + 1; /* Skip header leading newline on first output. */ fmt = header_fmt + 1; /* Skip header leading newline on first output. */
i = 0; i = 0;
do { do {
off_t current;
if (nfiles > header_threshhold) { if (nfiles > header_threshhold) {
tail_xprint_header(fmt, argv[i]); tail_xprint_header(fmt, argv[i]);
fmt = header_fmt; fmt = header_fmt;
@ -173,12 +171,11 @@ int tail_main(int argc, char **argv)
/* Optimizing count-bytes case if the file is seekable. /* Optimizing count-bytes case if the file is seekable.
* Beware of backing up too far. * Beware of backing up too far.
* Also we exclude files with size 0 (because of /proc/xxx) */ * Also we exclude files with size 0 (because of /proc/xxx) */
current = lseek(fds[i], 0, SEEK_END); if (COUNT_BYTES && !from_top) {
off_t current = lseek(fds[i], 0, SEEK_END);
if (current > 0) { if (current > 0) {
if (!from_top) {
if (count == 0) if (count == 0)
continue; /* showing zero lines is easy :) */ continue; /* showing zero lines is easy :) */
if (COUNT_BYTES) {
current -= count; current -= count;
if (current < 0) if (current < 0)
current = 0; current = 0;
@ -187,7 +184,6 @@ int tail_main(int argc, char **argv)
continue; continue;
} }
} }
}
buf = tailbuf; buf = tailbuf;
taillen = 0; taillen = 0;

8
testsuite/tail/tail-n-works
View File

@ -1,4 +1,4 @@
[ -n "$d" ] || d=.. echo -ne "abc\ndef\n123\n" >input
tail -n 2 "$d/README" > logfile.gnu echo -ne "def\n123\n" >logfile.ok
busybox tail -n 2 "$d/README" > logfile.bb busybox tail -n 2 input > logfile.bb
cmp logfile.gnu logfile.bb cmp logfile.ok logfile.bb

8
testsuite/tail/tail-works
View File

@ -1,4 +1,4 @@
[ -n "$d" ] || d=.. echo -ne "abc\ndef\n123\n" >input
tail -n 2 "$d/README" > logfile.gnu echo -ne "def\n123\n" >logfile.ok
busybox tail -n 2 "$d/README" > logfile.bb busybox tail -2 input > logfile.bb
cmp logfile.gnu logfile.bb cmp logfile.ok logfile.bb