2 files changed, 16 insertions, 3 deletions

diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 3f67b835f..45776dcbe 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -106,15 +106,28 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         switch (file_header->mode & S_IFMT) {
         case S_IFREG: {
                 /* Regular file */
+                char *dst_name;
                 int flags = O_WRONLY | O_CREAT | O_EXCL;
                 if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
                         flags = O_WRONLY | O_CREAT | O_TRUNC;
-                dst_fd = xopen3(file_header->name,
+                dst_name = file_header->name;
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME)
+                        /* rpm-style temp file name */
+                        dst_name = xasprintf("%s;%x", dst_name, (int)getpid());
+#endif
+                dst_fd = xopen3(dst_name,
                         flags,
                         file_header->mode
                         );
                 bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size);
                 close(dst_fd);
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) {
+                        xrename(dst_name, file_header->name);
+                        free(dst_name);
+                }
+#endif
                 break;
         }
         case S_IFDIR:
diff --git a/archival/rpm.c b/archival/rpm.c
index 793701652..6b227d537 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -242,8 +242,8 @@ static void extract_cpio(int fd, const char *source_rpm)
                 /* compat: overwrite existing files.
                  * try "rpm -i foo.src.rpm" few times in a row -
                  * standard rpm will not complain.
-                 * (TODO? real rpm creates "file;1234" and then renames it) */
-                | ARCHIVE_UNLINK_OLD;
+                 */
+                | ARCHIVE_REPLACE_VIA_RENAME;
         archive_handle->src_fd = fd;
         /*archive_handle->offset = 0; - init_handle() did it */