For testing ctime at archive_matching, use mtime if ctime is not set.

SVN-Revision: 4166

diff --git a/libarchive/archive_matching.c b/libarchive/archive_matching.c
index 315a1e31d07096a58f4e1059aae0529a03022994..8d49ddab2b1ec736bad695eccdbd153eb1ece7b4 100644 (file)
--- a/libarchive/archive_matching.c
+++ b/libarchive/archive_matching.c
@@ -1337,19 +1337,33 @@ time_excluded(struct archive_matching *a, struct archive_entry *entry)
         * If this file/dir is excluded by a time comparison, skip it.
         */
        if (a->newer_ctime_filter) {
-               sec = archive_entry_ctime(entry);
+               /* If ctime is not set, use mtime instead. */
+               if (archive_entry_ctime_is_set(entry))
+                       sec = archive_entry_ctime(entry);
+               else
+                       sec = archive_entry_mtime(entry);
                if (sec < a->newer_ctime_sec)
                        return (1); /* Too old, skip it. */
-               nsec = archive_entry_ctime_nsec(entry);
+               if (archive_entry_ctime_is_set(entry))
+                       nsec = archive_entry_ctime_nsec(entry);
+               else
+                       nsec = archive_entry_mtime_nsec(entry);
                if (sec == a->newer_ctime_sec
                    && nsec <= a->newer_ctime_nsec)
                        return (1); /* Too old, skip it. */
        }
        if (a->older_ctime_filter) {
-               sec = archive_entry_ctime(entry);
+               /* If ctime is not set, use mtime instead. */
+               if (archive_entry_ctime_is_set(entry))
+                       sec = archive_entry_ctime(entry);
+               else
+                       sec = archive_entry_mtime(entry);
                if (sec > a->older_ctime_sec)
                        return (1); /* Too new, skip it. */
-               nsec = archive_entry_ctime_nsec(entry);
+               if (archive_entry_ctime_is_set(entry))
+                       nsec = archive_entry_ctime_nsec(entry);
+               else
+                       nsec = archive_entry_mtime_nsec(entry);
                if (sec == a->older_ctime_sec
                    && nsec >= a->older_ctime_nsec)
                        return (1); /* Too new, skip it. */