1 files changed, 20 insertions, 3 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 320cbae72..16bb33227 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -30,12 +30,12 @@
 //config:config FEATURE_AR_LONG_FILENAMES
 //config:       bool "Support long filenames (not needed for debs)"
 //config:       default y
-//config:       depends on AR
+//config:       depends on AR || MAKE || PDPMAKE
 //config:       help
 //config:       By default the ar format can only store the first 15 characters
 //config:       of the filename, this option removes that limitation.
 //config:       It supports the GNU ar long filename method which moves multiple long
-//config:       filenames into a the data section of a new ar entry.
+//config:       filenames into the data section of a new ar entry.
 //config:
 //config:config FEATURE_AR_CREATE
 //config:       bool "Support archive creation"
@@ -153,6 +153,9 @@ static int write_ar_archive(archive_handle_t *handle)
 {
         struct stat st;
         archive_handle_t *out_handle;
+#if ENABLE_PLATFORM_MINGW32
+        char *temp_fn = NULL;
+#endif
 
         xfstat(handle->src_fd, &st, handle->ar__name);
 
@@ -161,8 +164,14 @@ static int write_ar_archive(archive_handle_t *handle)
          */
         if (st.st_size != 0) {
                 out_handle = init_handle();
+#if !ENABLE_PLATFORM_MINGW32
                 xunlink(handle->ar__name);
                 out_handle->src_fd = xopen(handle->ar__name, O_WRONLY | O_CREAT | O_TRUNC);
+#else
+                /* can't unlink open file, create temporary output file */
+                temp_fn = xasprintf("%sXXXXXX", handle->ar__name);
+                out_handle->src_fd = xmkstemp(temp_fn);
+#endif
                 out_handle->accept = handle->accept;
         } else {
                 out_handle = handle;
@@ -184,12 +193,20 @@ static int write_ar_archive(archive_handle_t *handle)
                 continue;
 
         /* optional, since we exit right after we return */
-        if (ENABLE_FEATURE_CLEAN_UP) {
+        if (ENABLE_FEATURE_CLEAN_UP || ENABLE_PLATFORM_MINGW32) {
                 close(handle->src_fd);
                 if (out_handle->src_fd != handle->src_fd)
                         close(out_handle->src_fd);
         }
 
+#if ENABLE_PLATFORM_MINGW32
+        if (temp_fn != NULL) {
+                xrename(temp_fn, handle->ar__name);
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        free(temp_fn);
+        }
+#endif
+
         return EXIT_SUCCESS;
 }
 #endif /* FEATURE_AR_CREATE */