summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/990-upstream_tail_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-11-10 16:51:11 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-11-10 16:51:11 +0000
commit9fa7dc2498bbb762e9b1a6d22a48f1f9e4c1ef17 (patch)
tree6149c44bd54059b9f96a550a4b44328b71c991dd /package/busybox/patches/990-upstream_tail_fix.patch
parent7431c1813f50563ae066c8b3a683aee3725d3ca9 (diff)
upgrade busybox to 1.8.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9524 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/990-upstream_tail_fix.patch')
-rw-r--r--package/busybox/patches/990-upstream_tail_fix.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/package/busybox/patches/990-upstream_tail_fix.patch b/package/busybox/patches/990-upstream_tail_fix.patch
deleted file mode 100644
index 17ca43501..000000000
--- a/package/busybox/patches/990-upstream_tail_fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: busybox-1.7.2/coreutils/tail.c
-===================================================================
---- busybox-1.7.2.orig/coreutils/tail.c 2007-10-30 15:34:59.000000000 -0500
-+++ busybox-1.7.2/coreutils/tail.c 2007-10-30 15:35:06.000000000 -0500
-@@ -47,13 +47,16 @@
- static ssize_t tail_read(int fd, char *buf, size_t count)
- {
- ssize_t r;
-- off_t current, end;
-+ off_t current;
- struct stat sbuf;
-
-- end = current = lseek(fd, 0, SEEK_CUR);
-- if (!fstat(fd, &sbuf))
-- end = sbuf.st_size;
-- lseek(fd, end < current ? 0 : current, SEEK_SET);
-+ /* (A good comment is missing here) */
-+ current = lseek(fd, 0, SEEK_CUR);
-+ /* /proc files report zero st_size, don't lseek them. */
-+ if (fstat(fd, &sbuf) == 0 && sbuf.st_size)
-+ if (sbuf.st_size < current)
-+ lseek(fd, 0, SEEK_SET);
-+
- r = safe_read(fd, buf, count);
- if (r < 0) {
- bb_perror_msg(bb_msg_read_error);
-@@ -67,8 +70,12 @@
-
- static unsigned eat_num(const char *p)
- {
-- if (*p == '-') p++;
-- else if (*p == '+') { p++; G.status = EXIT_FAILURE; }
-+ if (*p == '-')
-+ p++;
-+ else if (*p == '+') {
-+ p++;
-+ G.status = EXIT_FAILURE;
-+ }
- return xatou_sfx(p, tail_suffixes);
- }
-