summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Golaszewski <bartekgola@gmail.com>2013-10-14 18:11:55 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-10-16 13:02:50 (GMT)
commit64938011f3ba06a8f425926397172dc361bce851 (patch)
treed3e406ab6e54d9235b6f7e9e03534d3ef064260a
parent840ef17f63c85044c15d9a38a13c6539e26dfc31 (diff)
downloadbusybox-64938011f3ba06a8f425926397172dc361bce851.tar.gz
busybox-64938011f3ba06a8f425926397172dc361bce851.tar.bz2
tail compat: fix header printing for tail -f
Makes tail -f for multiple files display the header only if another (ie. not currently displayed) file changed. Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--TODO5
-rw-r--r--coreutils/tail.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/TODO b/TODO
index d2a085e..dcf48c2 100644
--- a/TODO
+++ b/TODO
@@ -127,11 +127,6 @@ patch
And while we're at it, a new patch filename quoting format is apparently
coming soon: http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
----
-tail
- ./busybox tail -f foo.c~ TODO
- should not print fmt=header_fmt for subsequent date >> TODO; i.e. only
- fmt+ if another (not the current) file did change
Architectural issues:
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 07c71ca..eab502b 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -105,6 +105,7 @@ int tail_main(int argc, char **argv)
int *fds;
const char *fmt;
+ int prev_fd;
INIT_G();
@@ -309,6 +310,7 @@ int tail_main(int argc, char **argv)
xwrite(STDOUT_FILENO, tailbuf, taillen);
}
} while (++i < nfiles);
+ prev_fd = fds[i-1];
tailbuf = xrealloc(tailbuf, BUFSIZ);
@@ -365,9 +367,10 @@ int tail_main(int argc, char **argv)
nread = tail_read(fd, tailbuf, BUFSIZ);
if (nread <= 0)
break;
- if (fmt) {
+ if (fmt && (fd != prev_fd)) {
tail_xprint_header(fmt, filename);
fmt = NULL;
+ prev_fd = fd;
}
xwrite(STDOUT_FILENO, tailbuf, nread);
}