diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2011-07-14 09:39:47 -0400 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2011-07-14 09:39:47 -0400 |
| commit | df0f7eb14dcac8a0626c74ce669273ddc5449997 (patch) | |
| tree | fcb2038f81d6b19fd96cecfb80a7f020b6d27fb1 /libarchive/archive_write_set_format_iso9660.c | |
| parent | cdfaf3c5561d2988fd07f65c82eda700003a3b81 (diff) | |
| download | libarchive-df0f7eb14dcac8a0626c74ce669273ddc5449997.tar.gz | |
In iso9660 writer and xar writer, always overwrite the existing file in the file tree
which file has the same name; it is better that front-end applications such as tar decide
how they handle that case.
SVN-Revision: 3480
Diffstat (limited to 'libarchive/archive_write_set_format_iso9660.c')
| -rw-r--r-- | libarchive/archive_write_set_format_iso9660.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c index 62c039d2..6bd530e1 100644 --- a/libarchive/archive_write_set_format_iso9660.c +++ b/libarchive/archive_write_set_format_iso9660.c @@ -5676,13 +5676,12 @@ same_entry: *isoentpp = NULL; return (ARCHIVE_FAILED); } - if (archive_entry_mtime(f1->entry) < - archive_entry_mtime(f2->entry) || np->virtual) { - /* Swap file entries. */ - np->file = f2; - isoent->file = f1; - np->virtual = 0; - } + + /* Swap file entries. */ + np->file = f2; + isoent->file = f1; + np->virtual = 0; + _isoent_free(isoent); *isoentpp = np; return (ARCHIVE_OK); |