Report correct time stamps, even when ignoring them and also ignore t…

…hem when comparing directories.
nih-at · Jun 20, 2024 · 7a734f6 · 7a734f6
1 parent 277e4c3
commit 7a734f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/regress/zipcmp_zip_dir.test b/regress/zipcmp_zip_dir.test
@@ -11,7 +11,7 @@ stdout
 --- zipcmp_zip_dir.zip
 +++ a
 - directory '00-empty-dir/'
-- file 'dir-with-file/a', size 1, crc e8b7be43, mtime 0
+- file 'dir-with-file/a', size 1, crc e8b7be43, mtime 1610623116
 + directory 'empty-dir-in-dir/'
 - directory 'empty-dir/'
 end-of-inline-data
diff --git a/regress/zipcmp_zip_dir_slash.test b/regress/zipcmp_zip_dir_slash.test
@@ -11,7 +11,7 @@ stdout
 --- zipcmp_zip_dir.zip
 +++ a/
 - directory '00-empty-dir/'
-- file 'dir-with-file/a', size 1, crc e8b7be43, mtime 0
+- file 'dir-with-file/a', size 1, crc e8b7be43, mtime 1610623116
 + directory 'empty-dir-in-dir/'
 - directory 'empty-dir/'
 end-of-inline-data
diff --git a/src/zipcmp.c b/src/zipcmp.c
@@ -568,12 +568,7 @@ list_zip(const char *name, struct archive *a) {
                 a->entry[i].comp_method = 0;
                 a->entry[i].n_extra_fields = 0;
             }
-            if (compare_time_stamps) {
-                a->entry[i].last_modification_time = st.mtime;
-            }
-            else {
-                a->entry[i].last_modification_time = 0;
-            }
+            a->entry[i].last_modification_time = st.mtime;
         }
 
         if (paranoid) {
@@ -755,7 +750,7 @@ entry_cmp(const void *p1, const void *p2) {
     if (e1->crc != e2->crc) {
         return (int)e1->crc - (int)e2->crc;
     }
-    if (e1->last_modification_time != e2->last_modification_time) {
+    if (compare_time_stamps && e1->last_modification_time != e2->last_modification_time) {
         return (int)(e1->last_modification_time - e2->last_modification_time);
     }