d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the "start_time" (time at which the restore process began)

Browse Source 
to fill in a missing atime instead of substituting mtime.

PR:		bin/124915
This commit is contained in:
kientzle 2008-09-01 02:50:24 +00:00
parent 7f570176d9
commit 7711ed1cf5
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libarchive/archive_write_disk.c
View File

@ -140,6 +140,7 @@ struct archive_write_disk {
uid_t user_uid;
dev_t skip_file_dev;
ino_t skip_file_ino;
time_t start_time;
gid_t (*lookup_gid)(void *private, const char *gname, gid_t gid);
void (*cleanup_gid)(void *private);
@ -445,6 +446,8 @@ _archive_write_header(struct archive *_a, struct archive_entry *entry)
fe->mtime_nanos = archive_entry_mtime_nsec(entry);
fe->atime = archive_entry_atime(entry);
fe->atime_nanos = archive_entry_atime_nsec(entry);
if (fe->atime == 0 && fe->atime_nanos == 0)
fe->atime = a->start_time;
}
if (a->deferred & TODO_FFLAGS) {
@ -720,6 +723,7 @@ archive_write_disk_new(void)
a->archive.vtable = archive_write_disk_vtable();
a->lookup_uid = trivial_lookup_uid;
a->lookup_gid = trivial_lookup_gid;
a->start_time = time(NULL);
#ifdef HAVE_GETEUID
a->user_uid = geteuid();
#endif /* HAVE_GETEUID */
@ -1625,11 +1629,13 @@ set_time(struct archive_write_disk *a)
times[0].tv_sec = archive_entry_atime(a->entry);
times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000;
/* If no atime was specified, use mtime instead. */
if (times[0].tv_sec == 0 && times[0].tv_usec == 0) {
times[0].tv_sec = times[1].tv_sec;
times[0].tv_usec = times[1].tv_usec;
}
/* If no atime was specified, use start time instead. */
/* In theory, it would be marginally more correct to use
* time(NULL) here, but that would cost us an extra syscall
* for little gain. */
if (times[0].tv_sec == 0 && times[0].tv_usec == 0)
times[0].tv_sec = a->start_time;
#ifdef HAVE_FUTIMES
if (a->fd >= 0 && futimes(a->fd, times) == 0) {
return (ARCHIVE_OK);
@ -1668,6 +1674,8 @@ set_time(struct archive_write_disk *a)
times.modtime = archive_entry_mtime(a->entry);
times.actime = archive_entry_atime(a->entry);
if (times.actime == 0)
times.actime = a->start_time;
if (!S_ISLNK(a->mode) && utime(a->name, &times) != 0) {
archive_set_error(&a->archive, errno,
"Can't update time for %s", a->name);

6
lib/libarchive/test/test_write_disk.c
View File

@ -60,6 +60,7 @@ static void create_reg_file(struct archive_entry *ae, const char *msg)
static const char data[]="abcdefghijklmnopqrstuvwxyz";
struct archive *ad;
struct stat st;
time_t now;
/* Write the entry to disk. */
assert((ad = archive_write_disk_new()) != NULL);
@ -97,10 +98,11 @@ static void create_reg_file(struct archive_entry *ae, const char *msg)
failure("st.st_mode=%o archive_entry_mode(ae)=%o",
st.st_mode, archive_entry_mode(ae));
assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
failure("No atime was specified, so atime should get set to mtime");
assertEqualInt(st.st_atime, st.st_mtime);
assertEqualInt(st.st_size, sizeof(data));
assertEqualInt(st.st_mtime, 123456789);
failure("No atime was specified, so atime should get set to current time");
now = time(NULL);
assert(st.st_atime <= now && st.st_atime > now - 5);
}
static void create_reg_file2(struct archive_entry *ae, const char *msg)