From 225ade520e338273930fa1962beff560436e423f Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Tue, 1 Aug 2006 05:31:29 +0000 Subject: [PATCH] If skip_file_dev and skip_file_ino haven't been set (are still == 0), then don't use them for testing for a recursive add. Thanks to: Spencer Minear MFC after: 7 days --- lib/libarchive/archive_write.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c index 73283e456c5..3a999ca34fa 100644 --- a/lib/libarchive/archive_write.c +++ b/lib/libarchive/archive_write.c @@ -201,7 +201,9 @@ archive_write_header(struct archive *a, struct archive_entry *entry) if (a->state & ARCHIVE_STATE_DATA) ((a->format_finish_entry)(a)); - if (archive_entry_dev(entry) == a->skip_file_dev && + if (a->skip_file_dev != 0 && + archive_entry_dev(entry) == a->skip_file_dev && + a->skip_file_ino != 0 && archive_entry_ino(entry) == a->skip_file_ino) { archive_set_error(a, 0, "Can't add archive to itself"); return (ARCHIVE_WARN);