CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-21 03:12:48 +02:00
Code Issues Projects Releases Wiki Activity

(change_timestamps): First arg is source

Browse Source 
struct stat, not file name.  All uses changed.
(install_file_in_file): Stat the source file if necessary.
Don't try to change time stamps if copy_file did it.
This commit is contained in:
Paul Eggert
2005-09-23 20:39:04 +00:00
parent 35044438af
commit 63b77aac44
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/install.c
View File

@@ -65,7 +65,7 @@
/* Number of bytes of a file to copy at a time. */
#define READ_SIZE (32 * 1024)
static bool change_timestamps (const char *from, const char *to);
static bool change_timestamps (struct stat const *from_sb, char const *to);
static bool change_attributes (char const *name);
static bool copy_file (const char *from, const char *to,
const struct cp_options *x);
@@ -439,14 +439,20 @@ static bool
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)
{
error (0, errno, _("cannot stat %s"), quote (from));
return false;
}
if (! copy_file (from, to, x))
return false;
if (strip_files)
strip (to);
if (! change_attributes (to))
return false;
if (x->preserve_timestamps)
return change_timestamps (from, to);
if (strip_files && x->preserve_timestamps)
return change_timestamps (&from_sb, to);
return true;
}
@@ -526,19 +532,12 @@ change_attributes (char const *name)
Return true if successful. */
static bool
change_timestamps (const char *from, const char *to)
change_timestamps (struct stat const *from_sb, char const *to)
{
struct stat stb;
struct timespec timespec[2];
timespec[0] = get_stat_atime (from_sb);
timespec[1] = get_stat_mtime (from_sb);
if (stat (from, &stb))
{
error (0, errno, _("cannot obtain time stamps for %s"), quote (from));
return false;
}
timespec[0] = get_stat_atime (&stb);
timespec[1] = get_stat_mtime (&stb);
if (utimens (to, timespec))
{
error (0, errno, _("cannot set time stamps for %s"), quote (to));