From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Sep 2005 23:02:14 +0000 (+0000)
Subject: (touch): Handle "touch -c - >&-" by checking for EBADF
X-Git-Tag: v5.90~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f897e72580eb68526972caf3ef815c5be50daba;p=thirdparty%2Fcoreutils.git

(touch): Handle "touch -c - >&-" by checking for EBADF
and ENOSYS.
Do not pass "-" to futimens; pass NULL instead.
If close (STDIN_FILENO) fails, report the error separately instead
of letting the 'close' pollute errno.
---

diff --git a/src/touch.c b/src/touch.c
index 8706061230..06c9646bc2 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -154,7 +154,7 @@ touch (const char *file)
 	    error (0, open_errno, _("creating %s"), quote (file));
 	  else
 	    {
-	      if (no_create && errno == ENOENT)
+	      if (no_create && (errno == ENOENT || errno == EBADF))
 		return true;
 	      error (0, errno, _("failed to get attributes of %s"),
 		     quote (file));
@@ -182,9 +182,23 @@ touch (const char *file)
       t = timespec;
     }
 
-  ok = (futimens (fd, file, t) == 0);
+  ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
+
   if (fd == STDIN_FILENO)
-    ok &= (close (fd) == 0);
+    {
+      if (close (STDIN_FILENO) != 0)
+	{
+	  error (0, errno, _("closing %s"), quote (file));
+	  return false;
+	}
+    }
+  else if (fd == STDOUT_FILENO)
+    {
+      /* Do not diagnose "touch -c - >&-".  */
+      if (!ok && errno == EBADF && no_create
+	  && change_times == (CH_ATIME | CH_MTIME))
+	return true;
+    }
 
   if (!ok)
     {