diff options
author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-03 15:55:23 +0000 |
---|---|---|
committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-03 15:55:23 +0000 |
commit | 75c8653686b46bc08d0a6e8bc4967cc035b3c37d (patch) | |
tree | 1ec7d209531f9a92e451777411d4c5dc753cd8a3 /package/busybox/patches/000-upstream-tail.patch | |
parent | fe1f2bb1d957d199169580ca5b0c186ea2a66997 (diff) |
package/busybox: update to 1.19.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28725 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/000-upstream-tail.patch')
-rw-r--r-- | package/busybox/patches/000-upstream-tail.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/package/busybox/patches/000-upstream-tail.patch b/package/busybox/patches/000-upstream-tail.patch deleted file mode 100644 index 92805939f..000000000 --- a/package/busybox/patches/000-upstream-tail.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/coreutils/tail.c -+++ b/coreutils/tail.c -@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv) - int fd = fds[i]; - - if (ENABLE_FEATURE_FANCY_TAIL && fd < 0) -- continue; /* may happen with -E */ -+ continue; /* may happen with -F */ - - if (nfiles > header_threshhold) { - tail_xprint_header(fmt, argv[i]); -@@ -252,14 +252,14 @@ int tail_main(int argc, char **argv) - * Used only by +N code ("start from Nth", 1-based): */ - seen = 1; - newlines_seen = 0; -- while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 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 = count; -+ seen += nread; - } else { - char *s = buf; - do { ---- a/testsuite/tail.tests -+++ b/testsuite/tail.tests -@@ -14,4 +14,12 @@ testing "tail: +N with N > file length" - "0\n" \ - "" "qw" - -+testing "tail: -c +N with largish N" \ -+ " -+ dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8200 | wc -c; -+ dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8208 | wc -c; -+ " \ -+ "8185\n8177\n" \ -+ "" "" -+ - exit $FAILCOUNT |