diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2016-05-11 10:19:44 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2016-05-11 10:19:44 +0000 |
| commit | 4e579f6c9425c995106fbf72667f4ec7e5d5db85 (patch) | |
| tree | d298bb9fa3cf4f58e328e696a77fadf758a534eb /libarchive/archive_match.c | |
| parent | 8c8f03ca5b7f1f0d07c23e7c354a45b7c95335f0 (diff) | |
| download | src-4e579f6c9425c995106fbf72667f4ec7e5d5db85.tar.gz src-4e579f6c9425c995106fbf72667f4ec7e5d5db85.zip | |
Notes
Diffstat (limited to 'libarchive/archive_match.c')
| -rw-r--r-- | libarchive/archive_match.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libarchive/archive_match.c b/libarchive/archive_match.c index 6b6be9cb20b5..4c41badf1f86 100644 --- a/libarchive/archive_match.c +++ b/libarchive/archive_match.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include "archive.h" #include "archive_private.h" #include "archive_entry.h" +#include "archive_getdate.h" #include "archive_pathmatch.h" #include "archive_rb.h" #include "archive_string.h" @@ -184,7 +185,6 @@ static int time_excluded(struct archive_match *, struct archive_entry *); static int validate_time_flag(struct archive *, int, const char *); -time_t __archive_get_date(time_t now, const char *); #define get_date __archive_get_date static const struct archive_rb_tree_ops rb_ops_mbs = { @@ -580,6 +580,7 @@ add_pattern_from_file(struct archive_match *a, struct match_list *mlist, return (ARCHIVE_FATAL); } r = archive_read_support_format_raw(ar); + r = archive_read_support_format_empty(ar); if (r != ARCHIVE_OK) { archive_copy_error(&(a->archive), ar); archive_read_free(ar); @@ -596,9 +597,13 @@ add_pattern_from_file(struct archive_match *a, struct match_list *mlist, } r = archive_read_next_header(ar, &ae); if (r != ARCHIVE_OK) { - archive_copy_error(&(a->archive), ar); archive_read_free(ar); - return (r); + if (r == ARCHIVE_EOF) { + return (ARCHIVE_OK); + } else { + archive_copy_error(&(a->archive), ar); + return (r); + } } archive_string_init(&as); @@ -1152,7 +1157,7 @@ set_timefilter_pathname_mbs(struct archive_match *a, int timetype, { /* NOTE: stat() on Windows cannot handle nano seconds. */ HANDLE h; - WIN32_FIND_DATA d; + WIN32_FIND_DATAA d; if (path == NULL || *path == '\0') { archive_set_error(&(a->archive), EINVAL, "pathname is empty"); |