diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-01-19 06:15:41 -0500 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-01-19 06:15:41 -0500 |
| commit | 3df7554a9745565e8b9ad830ce5d65facdae475f (patch) | |
| tree | 3018280589072a21f98412448d653a73a630abfb /tar/bsdtar.c | |
| parent | 247d951a4a07884fca2e76cb95aba31893abc5c8 (diff) | |
| download | libarchive-3df7554a9745565e8b9ad830ce5d65facdae475f.tar.gz | |
Add archive_read_disk_set_behavior function and drop archive_read_disk_honor_nodump and
archive_read_disk_disable_mac_copyfile.
SVN-Revision: 4184
Diffstat (limited to 'tar/bsdtar.c')
| -rw-r--r-- | tar/bsdtar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tar/bsdtar.c b/tar/bsdtar.c index a2d4617f..9ed1d6f8 100644 --- a/tar/bsdtar.c +++ b/tar/bsdtar.c @@ -241,10 +241,10 @@ main(int argc, char **argv) * Enable Mac OS "copyfile()" extension by default. * This has no effect on other platforms. */ - bsdtar->enable_copyfile = 1; + bsdtar->readdisk_flags |= ARCHIVE_READDISK_MAC_COPYFILE; #ifdef COPYFILE_DISABLE_VAR if (getenv(COPYFILE_DISABLE_VAR)) - bsdtar->enable_copyfile = 0; + bsdtar->readdisk_flags &= ~ARCHIVE_READDISK_MAC_COPYFILE; #endif bsdtar->matching = archive_matching_new(); if (bsdtar->matching == NULL) @@ -290,7 +290,7 @@ main(int argc, char **argv) bsdtar->option_chroot = 1; break; case OPTION_DISABLE_COPYFILE: /* Mac OS X */ - bsdtar->enable_copyfile = 0; + bsdtar->readdisk_flags &= ~ARCHIVE_READDISK_MAC_COPYFILE; break; case OPTION_EXCLUDE: /* GNU tar */ if (archive_matching_exclude_pattern( @@ -424,7 +424,7 @@ main(int argc, char **argv) archive_error_string(bsdtar->matching)); break; case OPTION_NODUMP: /* star */ - bsdtar->option_honor_nodump = 1; + bsdtar->readdisk_flags |= ARCHIVE_READDISK_HONOR_NODUMP; break; case OPTION_NO_SAME_OWNER: /* GNU tar */ bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_OWNER; @@ -614,7 +614,7 @@ main(int argc, char **argv) only_mode(bsdtar, "--one-file-system", "cru"); if (bsdtar->option_fast_read) only_mode(bsdtar, "--fast-read", "xt"); - if (bsdtar->option_honor_nodump) + if (bsdtar->readdisk_flags & ARCHIVE_READDISK_HONOR_NODUMP) only_mode(bsdtar, "--nodump", "cru"); if (option_o > 0) { switch (bsdtar->mode) { |