From: Jim Meyering <meyering@redhat.com>
Date: Tue, 8 Sep 2009 06:26:22 +0000 (+0200)
Subject: tail: make the new piped-stdin test as portable as the old one
X-Git-Tag: v7.6~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0ff8c73fe8ae505d2029e905b23ac534d11990c;p=platform%2Fupstream%2Fcoreutils.git

tail: make the new piped-stdin test as portable as the old one

* src/tail.c (main): Adapt piped-stdin test to use the same isapipe,
test as was used in the preceding POSIXLY_CORRECT condition.
Remove the now-subsumed POSIXLY_CORRECT test.
Reported by Pádraig Brady.
* doc/coreutils.texi (tail invocation): Document this change.
* NEWS (Changes in behavior): Reclassify, clarify.
---

diff --git a/NEWS b/NEWS
index 7d4f7e2..7805fe5 100644
--- a/NEWS
+++ b/NEWS
@@ -46,11 +46,13 @@ GNU coreutils NEWS                                    -*- outline -*-
   cp --reflink accepts a new "auto" parameter which falls back to
   a standard copy if creating a copy-on-write clone is not possible.
 
-** POSIX conformance
+** Changes in behavior
 
-  tail -f now ignores "-" when stdin is a pipe or FIFO, per POSIX.
-  Now, :|tail -f terminates immediately.  Before, it would block indefinitely.
-  [the old behavior dates back to the original implementation]
+  tail -f now ignores "-" when stdin is a pipe or FIFO.
+  tail-with-no-args now ignores -f unconditionally when stdin is a pipe or FIFO.
+  Before, it would ignore -f only when no file argument was specified,
+  and then only when POSIXLY_CORRECT was set.  Now, :|tail -f - terminates
+  immediately.  Before, it would block indefinitely.
 
 
 * Noteworthy changes in release 7.5 (2009-08-20) [stable]
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 86394a1..16ff613 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -2782,9 +2782,10 @@ growing.
 The option values @samp{descriptor} and @samp{name} may be specified only
 with the long form of the option, not with @option{-f}.
 
-@vindex POSIXLY_CORRECT
-If @env{POSIXLY_CORRECT} is set, the @option{-f} option is ignored if
+The @option{-f} option is ignored if
 no @var{file} operand is specified and standard input is a FIFO or a pipe.
+Likewise, the @option{-f} option has no effect for any
+operand specified as @samp{-}, when standard input is a FIFO or a pipe.
 
 @item -F
 @opindex -F
diff --git a/src/tail.c b/src/tail.c
index 63874bb..81cbae0 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -1922,28 +1922,6 @@ main (int argc, char **argv)
       static char *dummy_stdin = (char *) "-";
       n_files = 1;
       file = &dummy_stdin;
-
-      /* POSIX says that -f is ignored if no file operand is specified
-         and standard input is a pipe.  However, the GNU coding
-         standards say that program behavior should not depend on
-         device type, because device independence is an important
-         principle of the system's design.
-
-         Follow the POSIX requirement only if POSIXLY_CORRECT is set.  */
-
-      if (forever && getenv ("POSIXLY_CORRECT"))
-        {
-          struct stat st;
-          int is_a_fifo_or_pipe =
-            (fstat (STDIN_FILENO, &st) != 0 ? -1
-             : S_ISFIFO (st.st_mode) ? 1
-             : HAVE_FIFO_PIPES == 1 ? 0
-             : isapipe (STDIN_FILENO));
-          if (is_a_fifo_or_pipe < 0)
-            error (EXIT_FAILURE, errno, _("standard input"));
-          if (is_a_fifo_or_pipe)
-            forever = false;
-        }
     }
 
   {
@@ -1986,8 +1964,13 @@ main (int argc, char **argv)
   size_t n_viable = 0;
   for (i = 0; i < n_files; i++)
     {
-      if (STREQ (F[i].name, "-") && !F[i].ignore
-          && 0 <= F[i].fd && S_ISFIFO (F[i].mode))
+      bool is_a_fifo_or_pipe =
+        (STREQ (F[i].name, "-")
+         && !F[i].ignore
+         && 0 <= F[i].fd
+         && (S_ISFIFO (F[i].mode)
+             || (HAVE_FIFO_PIPES != 1 && isapipe (F[i].fd))));
+      if (is_a_fifo_or_pipe)
         F[i].ignore = true;
       else
         ++n_viable;