Changeset 1772 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/tail.c

Timestamp:

Nov 6, 2007, 9:23:18 PM (16 years ago)

Author:

Bruno Cornec

Message:

Update mindi-busybox to 1.7.3

File:

• branches/2.2.5/mindi-busybox/coreutils/tail.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/tail.c

@@ -48 +48 @@
 {
     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) {
@@ -68 +71 @@
 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);
 }