From 57b11473b0135b1e092cf045f94635c934c7c63f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 24 Aug 2010 15:44:10 -0700 Subject: [PATCH] tar: use ctime, not mtime, when checking placeholders * src/extract.c (struct delayed_link): Rename member mtime to ctime. All uses changed to use ctime rather than mtime. --- src/extract.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/extract.c b/src/extract.c index 653e2a0..dad7746 100644 --- a/src/extract.c +++ b/src/extract.c @@ -80,10 +80,12 @@ struct delayed_link /* The next delayed link in the list. */ struct delayed_link *next; - /* The device, inode number and last-modified time of the placeholder. */ + /* The device, inode number and ctime of the placeholder. Use + ctime, not mtime, to make false matches less likely if some + other process removes the placeholder. */ dev_t dev; ino_t ino; - struct timespec mtime; + struct timespec ctime; /* True if the link is symbolic. */ bool is_symlink; @@ -924,7 +926,7 @@ create_placeholder_file (char *file_name, bool is_symlink, bool *interdir_made) delayed_link_head = p; p->dev = st.st_dev; p->ino = st.st_ino; - p->mtime = get_stat_mtime (&st); + p->ctime = get_stat_ctime (&st); p->is_symlink = is_symlink; if (is_symlink) { @@ -990,7 +992,7 @@ extract_link (char *file_name, int typeflag) for (; ds; ds = ds->next) if (ds->dev == st1.st_dev && ds->ino == st1.st_ino - && timespec_cmp (ds->mtime, get_stat_mtime (&st1)) == 0) + && timespec_cmp (ds->ctime, get_stat_ctime (&st1)) == 0) { struct string_list *p = xmalloc (offsetof (struct string_list, string) + strlen (file_name) + 1); @@ -1347,7 +1349,7 @@ apply_delayed_links (void) if (lstat (source, &st) == 0 && st.st_dev == ds->dev && st.st_ino == ds->ino - && timespec_cmp (get_stat_mtime (&st), ds->mtime) == 0) + && timespec_cmp (get_stat_ctime (&st), ds->ctime) == 0) { /* Unlink the placeholder, then create a hard link if possible, a symbolic link otherwise. */ -- 2.44.0