From 3d2977f28287e1d0311c1b0ce62cfeaa35785ec2 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 4 Aug 2009 10:29:49 -0700 Subject: [PATCH] Revert "Preserve hard links with --remove-files" This reverts commit f1ed85d46043c523cd5b8196c1d266f3606a2531. The idea behind these patches was just fine, but upstream just accepted a slightly modified version, so I'm reverting mine in favor of that from upstream. --- debian/changelog | 3 +-- src/create.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 747988e..df3a125 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,8 @@ tar (1.22-1.2) UNRELEASED; urgency=low * Add Carl Worth as an uploader. * Fix to allow parallel build (-j2), closes #535319 * Don't close file stream before EOF, closes #525818 - * Preserve hard links with --remove-files, closes #188663 - -- Carl Worth Wed, 29 Jul 2009 21:28:45 -0700 + -- Carl Worth Wed, 29 Jul 2009 16:18:18 -0700 tar (1.22-1.1) unstable; urgency=low diff --git a/src/create.c b/src/create.c index 559aaa0..fde7ed1 100644 --- a/src/create.c +++ b/src/create.c @@ -1377,7 +1377,7 @@ static Hash_table *link_table; static bool dump_hard_link (struct tar_stat_info *st) { - if (link_table && (st->stat.st_nlink > 1 || remove_files_option)) + if (link_table && st->stat.st_nlink > 1) { struct link lp; struct link *duplicate; @@ -1424,7 +1424,7 @@ file_count_links (struct tar_stat_info *st) { if (hard_dereference_option) return; - if (st->stat.st_nlink > 1 || remove_files_option) + if (st->stat.st_nlink > 1) { struct link *duplicate; struct link *lp = xmalloc (offsetof (struct link, name) -- 2.43.0