diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-11-10 16:51:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-11-10 16:51:11 +0000 |
| commit | 8fba43d0f136bdd7414ce94587d89c7a9e2b0900 (patch) | |
| tree | 161f89573c5ea33c47d060a1a75a03f4fbaeddc7 /package/busybox/patches/990-upstream_tail_fix.patch | |
| parent | fe6294e21cc6924e5148863b9b3060eb9ef05cd1 (diff) | |
| download | upstream-8fba43d0f136bdd7414ce94587d89c7a9e2b0900.tar.gz upstream-8fba43d0f136bdd7414ce94587d89c7a9e2b0900.tar.bz2 upstream-8fba43d0f136bdd7414ce94587d89c7a9e2b0900.zip | |
upgrade busybox to 1.8.1
SVN-Revision: 9524
Diffstat (limited to 'package/busybox/patches/990-upstream_tail_fix.patch')
| -rw-r--r-- | package/busybox/patches/990-upstream_tail_fix.patch | 41 |
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 17ca43501a..0000000000 --- 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); - } - |