diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-02-08 05:09:25 +0900 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-02-08 05:09:25 +0900 |
| commit | b4d25a741c58200e1b48c5108140aedf8c1acccc (patch) | |
| tree | 5b6cd2b0853bf904d91040bbc6976d1ef315da14 /tar/bsdtar.c | |
| parent | c5356170ba6ae487ea7a1c80bb6d433eaf7715ec (diff) | |
| download | libarchive-b4d25a741c58200e1b48c5108140aedf8c1acccc.tar.gz | |
Rename archive_matching to archive_match.
Diffstat (limited to 'tar/bsdtar.c')
| -rw-r--r-- | tar/bsdtar.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tar/bsdtar.c b/tar/bsdtar.c index 9993ff31..0d723f3a 100644 --- a/tar/bsdtar.c +++ b/tar/bsdtar.c @@ -240,7 +240,7 @@ main(int argc, char **argv) if (getenv(COPYFILE_DISABLE_VAR)) bsdtar->readdisk_flags &= ~ARCHIVE_READDISK_MAC_COPYFILE; #endif - bsdtar->matching = archive_matching_new(); + bsdtar->matching = archive_match_new(); if (bsdtar->matching == NULL) lafe_errc(1, errno, "Out of memory"); @@ -287,7 +287,7 @@ main(int argc, char **argv) bsdtar->readdisk_flags &= ~ARCHIVE_READDISK_MAC_COPYFILE; break; case OPTION_EXCLUDE: /* GNU tar */ - if (archive_matching_exclude_pattern( + if (archive_match_exclude_pattern( bsdtar->matching, bsdtar->argument) != ARCHIVE_OK) lafe_errc(1, 0, "Couldn't exclude %s\n", bsdtar->argument); @@ -339,7 +339,7 @@ main(int argc, char **argv) * no one else needs this to filter entries * when transforming archives. */ - if (archive_matching_include_pattern(bsdtar->matching, + if (archive_match_include_pattern(bsdtar->matching, bsdtar->argument) != ARCHIVE_OK) lafe_errc(1, 0, "Failed to add %s to inclusion list", @@ -394,31 +394,29 @@ main(int argc, char **argv) * TODO: Add corresponding "older" options to reverse these. */ case OPTION_NEWER_CTIME: /* GNU tar */ - if (archive_matching_include_date(bsdtar->matching, - ARCHIVE_MATCHING_CTIME | ARCHIVE_MATCHING_NEWER, + if (archive_match_include_date(bsdtar->matching, + ARCHIVE_MATCH_CTIME | ARCHIVE_MATCH_NEWER, bsdtar->argument) != ARCHIVE_OK) lafe_errc(1, 0, "Error : %s", archive_error_string(bsdtar->matching)); break; case OPTION_NEWER_CTIME_THAN: - if (archive_matching_include_time_pathname( - bsdtar->matching, - ARCHIVE_MATCHING_CTIME | ARCHIVE_MATCHING_NEWER, + if (archive_match_include_file_time(bsdtar->matching, + ARCHIVE_MATCH_CTIME | ARCHIVE_MATCH_NEWER, bsdtar->argument) != ARCHIVE_OK) lafe_errc(1, 0, "Error : %s", archive_error_string(bsdtar->matching)); break; case OPTION_NEWER_MTIME: /* GNU tar */ - if (archive_matching_include_date(bsdtar->matching, - ARCHIVE_MATCHING_MTIME | ARCHIVE_MATCHING_NEWER, + if (archive_match_include_date(bsdtar->matching, + ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_NEWER, bsdtar->argument) != ARCHIVE_OK) lafe_errc(1, 0, "Error : %s", archive_error_string(bsdtar->matching)); break; case OPTION_NEWER_MTIME_THAN: - if (archive_matching_include_time_pathname( - bsdtar->matching, - ARCHIVE_MATCHING_MTIME | ARCHIVE_MATCHING_NEWER, + if (archive_match_include_file_time(bsdtar->matching, + ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_NEWER, bsdtar->argument) != ARCHIVE_OK) lafe_errc(1, 0, "Error : %s", archive_error_string(bsdtar->matching)); @@ -683,7 +681,7 @@ main(int argc, char **argv) break; } - archive_matching_free(bsdtar->matching); + archive_match_free(bsdtar->matching); #if HAVE_REGEX_H cleanup_substitution(bsdtar); #endif |