write.c (833a452e9f082a7982a31c21f0da437dbbe0a39d) write.c (64884e0d4ce7ed57c970e1b34f93e3754c656900)
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * Copyright (c) 2012 Michihiro NAKAJIMA
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 680 unchanged lines hidden (view full) ---

689append_archive(struct bsdtar *bsdtar, struct archive *a, struct archive *ina)
690{
691 struct archive_entry *in_entry;
692 int e;
693
694 while (ARCHIVE_OK == (e = archive_read_next_header(ina, &in_entry))) {
695 if (archive_match_excluded(bsdtar->matching, in_entry))
696 continue;
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * Copyright (c) 2012 Michihiro NAKAJIMA
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 680 unchanged lines hidden (view full) ---

689append_archive(struct bsdtar *bsdtar, struct archive *a, struct archive *ina)
690{
691 struct archive_entry *in_entry;
692 int e;
693
694 while (ARCHIVE_OK == (e = archive_read_next_header(ina, &in_entry))) {
695 if (archive_match_excluded(bsdtar->matching, in_entry))
696 continue;
697 if(edit_pathname(bsdtar, in_entry))
698 continue;
697 if ((bsdtar->flags & OPTFLAG_INTERACTIVE) &&
698 !yes("copy '%s'", archive_entry_pathname(in_entry)))
699 continue;
700 if (bsdtar->verbose > 1) {
701 safe_fprintf(stderr, "a ");
702 list_item_verbose(bsdtar, stderr, in_entry);
703 } else if (bsdtar->verbose > 0)
704 safe_fprintf(stderr, "a %s",

--- 353 unchanged lines hidden --- 		699 if ((bsdtar->flags & OPTFLAG_INTERACTIVE) &&
700 !yes("copy '%s'", archive_entry_pathname(in_entry)))
701 continue;
702 if (bsdtar->verbose > 1) {
703 safe_fprintf(stderr, "a ");
704 list_item_verbose(bsdtar, stderr, in_entry);
705 } else if (bsdtar->verbose > 0)
706 safe_fprintf(stderr, "a %s",

--- 353 unchanged lines hidden ---