aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-10-28 17:48:15 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-10-28 17:48:15 +0200
commit1e98f3741c5a844c1d3d7966f20cd09dded05d0d (patch)
tree6044a3e180389e63c55173f5018bf2ddaa195cd6 /coreutils
parented058016bf8fc98271de2e58bfb650de9e9d304d (diff)
downloadbusybox-w32-1e98f3741c5a844c1d3d7966f20cd09dded05d0d.tar.gz
busybox-w32-1e98f3741c5a844c1d3d7966f20cd09dded05d0d.tar.bz2
busybox-w32-1e98f3741c5a844c1d3d7966f20cd09dded05d0d.zip
Apply post-1.19.2 patches, bump version to 1.19.31_19_3
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/tail.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 454c25936..43cecbd97 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv)
203 int fd = fds[i]; 203 int fd = fds[i];
204 204
205 if (ENABLE_FEATURE_FANCY_TAIL && fd < 0) 205 if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
206 continue; /* may happen with -E */ 206 continue; /* may happen with -F */
207 207
208 if (nfiles > header_threshhold) { 208 if (nfiles > header_threshhold) {
209 tail_xprint_header(fmt, argv[i]); 209 tail_xprint_header(fmt, argv[i]);
@@ -252,14 +252,14 @@ int tail_main(int argc, char **argv)
252 * Used only by +N code ("start from Nth", 1-based): */ 252 * Used only by +N code ("start from Nth", 1-based): */
253 seen = 1; 253 seen = 1;
254 newlines_seen = 0; 254 newlines_seen = 0;
255 while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) { 255 while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
256 if (G.from_top) { 256 if (G.from_top) {
257 int nwrite = nread; 257 int nwrite = nread;
258 if (seen < count) { 258 if (seen < count) {
259 /* We need to skip a few more bytes/lines */ 259 /* We need to skip a few more bytes/lines */
260 if (COUNT_BYTES) { 260 if (COUNT_BYTES) {
261 nwrite -= (count - seen); 261 nwrite -= (count - seen);
262 seen = count; 262 seen += nread;
263 } else { 263 } else {
264 char *s = buf; 264 char *s = buf;
265 do { 265 do {