From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 23 Sep 2005 20:50:49 +0000 (+0000)
Subject: (install_file_in_file): Be more conservative about the previous patch:
X-Git-Tag: COREUTILS-5_90~112
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e4680db2fd9a0ad8efaabea3d41f34b00eddf4f;p=platform%2Fupstream%2Fcoreutils.git

(install_file_in_file): Be more conservative about the previous patch:
set time stamps on all non-regular files.
---

diff --git a/src/install.c b/src/install.c
index 1bdb0a7..116589a 100644
--- a/src/install.c
+++ b/src/install.c
@@ -440,7 +440,7 @@ install_file_in_file (const char *from, const char *to,
 		      const struct cp_options *x)
 {
   struct stat from_sb;
-  if (strip_files && x->preserve_timestamps && stat (from, &from_sb) != 0)
+  if (x->preserve_timestamps && stat (from, &from_sb) != 0)
     {
       error (0, errno, _("cannot stat %s"), quote (from));
       return false;
@@ -451,7 +451,7 @@ install_file_in_file (const char *from, const char *to,
     strip (to);
   if (! change_attributes (to))
     return false;
-  if (strip_files && x->preserve_timestamps)
+  if (x->preserve_timestamps && (strip_files || ! S_ISREG (from_sb.st_mode)))
     return change_timestamps (&from_sb, to);
   return true;
 }