Mon Feb 10 19:30:00 2020 UTC ()

Pull up following revision(s) (requested by christos in ticket #692):

	external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c: revision 1.5

When extracting symlinks atomically remove them like we do for hard links.


(martin)

diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c

--- src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c 2020/01/21 15:48:51	1.1.1.2.2.1
+++ src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c 2020/02/10 19:30:00	1.1.1.2.2.2

 @@ -2291,26 +2291,31 @@ create_filesystem_object(struct archive_
 		if (r != ARCHIVE_OK) {
 			archive_set_error(&a->archive, error_number, "%s",
 			    error_string.s);
 			free(linkname_copy);
 			archive_string_free(&error_string);
 			/*
 			 * EPERM is more appropriate than error_number for our
 			 * callers
 			 */
 			return (EPERM);
+		}
 		free(linkname_copy);
 		archive_string_free(&error_string);
 		/*
 		 * Unlinking and linking here is really not atomic,
 		 * but doing it right, would require us to construct
 		 * an mktemplink() function, and then use rename(2).
 		 */
 		if (a->flags & ARCHIVE_EXTRACT_ATOMIC)
 			unlink(a->name);
 		r = link(linkname, a->name) ? errno : 0;
 		/*
 		 * New cpio and pax formats allow hardlink entries
 		 * to carry data, so we may have to open the file
 		 * for hardlink entries.
+		 *
 		 * If the hardlink was successfully created and
 		 * the archive doesn't have carry data for it,
 		 * consider it to be non-authoritative for meta data.
 		 * This is consistent with GNU tar and BSD pax.
 		 * If the hardlink does carry data, let the last
 @@ -2331,27 +2336,35 @@ create_filesystem_object(struct archive_
 				a->fd = open(a->name, O_WRONLY | O_TRUNC |
 				    O_BINARY | O_CLOEXEC | O_NOFOLLOW);
 				__archive_ensure_cloexec_flag(a->fd);
 				if (a->fd < 0)
 					r = errno;
+			}
+		}
 		return (r);
 #endif
+	}
 	linkname = archive_entry_symlink(a->entry);
 	if (linkname != NULL) {
 #if HAVE_SYMLINK
-		int error = symlink(linkname, a->name) ? errno : 0;
+		int error;
 		/*
 		 * Unlinking and linking here is really not atomic,
 		 * but doing it right, would require us to construct
 		 * an mktempsymlink() function, and then use rename(2).
 		 */
 		if (a->flags & ARCHIVE_EXTRACT_ATOMIC)
 			unlink(a->name);
 		error = symlink(linkname, a->name) ? errno : 0;
 		if (error == 0) {
 #ifdef HAVE_LSTAT
 			r = lstat(a->name, &st);
 #else
 			r = la_stat(a->name, &st);
 #endif
 			if (r == -1)
 				return errno;
 			error = symlink_add(a, &st);
+		}
 		return error;
 #else
 		return (EPERM);