From d5792eb8851543fa25dbe8928a59f46b521fd674 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 20 Jul 2010 12:10:15 -0600 Subject: [PATCH] incorporate patch from Michael Banck fixing loop on symlink extraction with -k --- debian/changelog | 9 +++++ src/extract.c | 101 +++++++++++++++++++++++++++++++---------------- 2 files changed, 76 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2230248..52857b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,15 @@ tar (1.23-3) UNRELEASED; urgency=low -- Bdale Garbee Tue, 15 Jun 2010 09:32:39 -0600 +tar (1.23-2.1) unstable; urgency=low + + * Non-maintainer upload. + * src/extract.c: Apply upstream git commit b60e56fd which fixes a dead loop + on extracting existing symlinks with the -k option, closes: #577978, + #576876. + + -- Michael Banck Sun, 18 Jul 2010 17:14:48 +0200 + tar (1.23-2) unstable; urgency=low * use xz when lzma is called for, and stop suggesting both lzma since it's diff --git a/src/extract.c b/src/extract.c index 32a883f..531654a 100644 --- a/src/extract.c +++ b/src/extract.c @@ -888,12 +888,22 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made) struct stat st; while ((fd = open (file_name, O_WRONLY | O_CREAT | O_EXCL, 0)) < 0) - if (! maybe_recoverable (file_name, interdir_made)) - break; + { + switch (maybe_recoverable (file_name, interdir_made)) + { + case RECOVER_OK: + continue; + + case RECOVER_SKIP: + return 0; + + case RECOVER_NO: + open_error (file_name); + return -1; + } + } - if (fd < 0) - open_error (file_name); - else if (fstat (fd, &st) != 0) + if (fstat (fd, &st) != 0) { stat_error (file_name); close (fd); @@ -956,7 +966,8 @@ extract_link (char *file_name, int typeflag) { int interdir_made = 0; char const *link_name; - + int rc; + link_name = current_stat_info.link_name; if (! absolute_names_option && contains_dot_dot (link_name)) @@ -996,8 +1007,10 @@ extract_link (char *file_name, int typeflag) errno = e; } - while (maybe_recoverable (file_name, &interdir_made)); + while ((rc = maybe_recoverable (file_name, &interdir_made)) == RECOVER_OK); + if (rc == RECOVER_SKIP) + return 0; if (!(incremental_option && errno == EEXIST)) { link_error (link_name, file_name); @@ -1010,7 +1023,6 @@ static int extract_symlink (char *file_name, int typeflag) { #ifdef HAVE_SYMLINK - int status; int interdir_made = 0; if (! absolute_names_option @@ -1018,15 +1030,22 @@ extract_symlink (char *file_name, int typeflag) || contains_dot_dot (current_stat_info.link_name))) return create_placeholder_file (file_name, true, &interdir_made); - while ((status = symlink (current_stat_info.link_name, file_name))) - if (!maybe_recoverable (file_name, &interdir_made)) - break; - - if (status == 0) - set_stat (file_name, ¤t_stat_info, NULL, 0, 0, SYMTYPE); - else - symlink_error (current_stat_info.link_name, file_name); - return status; + while (symlink (current_stat_info.link_name, file_name)) + switch (maybe_recoverable (file_name, &interdir_made)) + { + case RECOVER_OK: + continue; + + case RECOVER_SKIP: + return 0; + + case RECOVER_NO: + symlink_error (current_stat_info.link_name, file_name); + return -1; + } + + set_stat (file_name, ¤t_stat_info, NULL, 0, 0, SYMTYPE); + return 0; #else static int warned_once; @@ -1052,16 +1071,23 @@ extract_node (char *file_name, int typeflag) mode_t invert_permissions = 0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0; - do - status = mknod (file_name, mode ^ invert_permissions, - current_stat_info.stat.st_rdev); - while (status && maybe_recoverable (file_name, &interdir_made)); + while (mknod (file_name, mode ^ invert_permissions, + current_stat_info.stat.st_rdev)) + switch (maybe_recoverable (file_name, &interdir_made)) + { + case RECOVER_OK: + continue; + + case RECOVER_SKIP: + return 0; + + case RECOVER_NO: + mknod_error (file_name); + return -1; + } - if (status != 0) - mknod_error (file_name); - else - set_stat (file_name, ¤t_stat_info, NULL, invert_permissions, - ARCHIVED_PERMSTATUS, typeflag); + set_stat (file_name, ¤t_stat_info, NULL, invert_permissions, + ARCHIVED_PERMSTATUS, typeflag); return status; } #endif @@ -1077,15 +1103,22 @@ extract_fifo (char *file_name, int typeflag) 0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0; while ((status = mkfifo (file_name, mode)) != 0) - if (!maybe_recoverable (file_name, &interdir_made)) - break; + switch (maybe_recoverable (file_name, &interdir_made)) + { + case RECOVER_OK: + continue; + + case RECOVER_SKIP: + return 0; + + case RECOVER_NO: + mkfifo_error (file_name); + return -1; + } - if (status == 0) - set_stat (file_name, ¤t_stat_info, NULL, invert_permissions, - ARCHIVED_PERMSTATUS, typeflag); - else - mkfifo_error (file_name); - return status; + set_stat (file_name, ¤t_stat_info, NULL, invert_permissions, + ARCHIVED_PERMSTATUS, typeflag); + return 0; } #endif -- 2.43.0