summaryrefslogtreecommitdiffstats
path: root/package/busybox/busybox-1.10.0-tail.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-03-25 14:38:45 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-03-25 14:38:45 +0000
commit18679d10a134533164a8b3ef18daa68831f16aec (patch)
tree4ed4a7bdab2d39260cd091170962b054cf376fc3 /package/busybox/busybox-1.10.0-tail.patch
parent85f8ba8a76947074540433520c2c8855703a5b21 (diff)
downloadbuildroot-novena-18679d10a134533164a8b3ef18daa68831f16aec.tar.gz
buildroot-novena-18679d10a134533164a8b3ef18daa68831f16aec.zip
busybox: add 1.10.0 release
Diffstat (limited to 'package/busybox/busybox-1.10.0-tail.patch')
-rw-r--r--package/busybox/busybox-1.10.0-tail.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.10.0-tail.patch b/package/busybox/busybox-1.10.0-tail.patch
new file mode 100644
index 000000000..990cdc308
--- /dev/null
+++ b/package/busybox/busybox-1.10.0-tail.patch
@@ -0,0 +1,62 @@
+--- busybox-1.10.0/coreutils/tail.c Thu Mar 20 12:46:51 2008
++++ busybox-1.10.0-tail/coreutils/tail.c Sun Mar 23 04:25:12 2008
+@@ -163,8 +163,6 @@
+ fmt = header_fmt + 1; /* Skip header leading newline on first output. */
+ i = 0;
+ do {
+- off_t current;
+-
+ if (nfiles > header_threshhold) {
+ tail_xprint_header(fmt, argv[i]);
+ fmt = header_fmt;
+@@ -173,19 +171,17 @@
+ /* 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) */
+- current = lseek(fds[i], 0, SEEK_END);
+- if (current > 0) {
+- if (!from_top) {
++ if (COUNT_BYTES && !from_top) {
++ off_t current = lseek(fds[i], 0, SEEK_END);
++ if (current > 0) {
+ if (count == 0)
+ continue; /* showing zero lines is easy :) */
+- if (COUNT_BYTES) {
+- current -= count;
+- if (current < 0)
+- current = 0;
+- xlseek(fds[i], current, SEEK_SET);
+- bb_copyfd_size(fds[i], STDOUT_FILENO, count);
+- continue;
+- }
++ current -= count;
++ if (current < 0)
++ current = 0;
++ xlseek(fds[i], current, SEEK_SET);
++ bb_copyfd_size(fds[i], STDOUT_FILENO, count);
++ continue;
+ }
+ }
+
+--- busybox-1.10.0/testsuite/tail/tail-n-works Thu Mar 20 12:46:57 2008
++++ busybox-1.10.0-tail/testsuite/tail/tail-n-works Sun Mar 23 04:25:12 2008
+@@ -1,4 +1,4 @@
+-[ -n "$d" ] || d=..
+-tail -n 2 "$d/README" > logfile.gnu
+-busybox tail -n 2 "$d/README" > logfile.bb
+-cmp logfile.gnu logfile.bb
++echo -ne "abc\ndef\n123\n" >input
++echo -ne "def\n123\n" >logfile.ok
++busybox tail -n 2 input > logfile.bb
++cmp logfile.ok logfile.bb
+--- busybox-1.10.0/testsuite/tail/tail-works Thu Mar 20 12:46:57 2008
++++ busybox-1.10.0-tail/testsuite/tail/tail-works Sun Mar 23 04:25:12 2008
+@@ -1,4 +1,4 @@
+-[ -n "$d" ] || d=..
+-tail -n 2 "$d/README" > logfile.gnu
+-busybox tail -n 2 "$d/README" > logfile.bb
+-cmp logfile.gnu logfile.bb
++echo -ne "abc\ndef\n123\n" >input
++echo -ne "def\n123\n" >logfile.ok
++busybox tail -2 input > logfile.bb
++cmp logfile.ok logfile.bb