From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 6 Feb 2022 16:04:24 +0100
Subject: New upstream version 5.2.2GA

---
 app/bin/archive.c | 44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

(limited to 'app/bin/archive.c')

diff --git a/app/bin/archive.c b/app/bin/archive.c
index 4e82bd3..430db49 100644
--- a/app/bin/archive.c
+++ b/app/bin/archive.c
@@ -20,42 +20,18 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <errno.h>
 #include <fcntl.h>
 
-#include <string.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <zip.h>
 
-#ifdef WINDOWS
-    #include "include/dirent.h"
-    #include <direct.h>
-    #include <io.h>
-    #include <process.h>
-    #define unlink(a) _unlink((a))
-    #define rmdir(a) _rmdir((a))
-    #define open(name, flag, mode) _open((name), (flag), (mode))
-    #define write(file, buffer, count) _write((file),(buffer), (count))
-    #define close(file) _close((file))
-    #define getpid() _getpid()
-#else
-    #include <dirent.h>
-    #include <unistd.h>
-#endif
-
-#include <wlib.h>
 #include "archive.h"
 #include "directory.h"
 #include "dynstring.h"
-#include "i18n.h"
-#include "messages.h"
 #include "misc.h"
 #include "misc2.h"
 #include "paths.h"
 #include "include/utf8convert.h"
+#include "common-ui.h"
 
 int log_zip = 0;
 
@@ -63,7 +39,7 @@ int log_zip = 0;
 //NativeToUtf8(const char *nativeString)
 //{
 //
-//#ifdef WINDOWS
+//#ifdef XINDOWS
 //
 //	int cnt = 2 * (strlen(nativeString) + 1);
 //	char *tempBuffer = MyMalloc( cnt );
@@ -227,11 +203,11 @@ BOOL_T AddDirectoryToArchive(
         } else {
 			char *archPathUtf8 = MyStrdup(arch_path);
 			char *fullPathUtf8 = MyStrdup(full_path);
-#ifdef WINDOWS
+#ifdef UTFCONVERT
 			archPathUtf8 = Convert2UTF8(archPathUtf8);
 			fullPathUtf8 = Convert2UTF8(fullPathUtf8);
 			ConvertPathForward(archPathUtf8);
-#endif // WINDOWS
+#endif // UTFCONVERT
             zt = zip_source_file(za, fullPathUtf8, 0, -1);
             if (zip_file_add(za, archPathUtf8, zt, ZIP_FL_ENC_UTF_8) == -1) {
                 zip_error_t  *ziperr = zip_get_error(za);
@@ -283,9 +259,9 @@ BOOL_T CreateArchive(
     MakeFullpath(&archive_path, workingDir, archive_name, NULL);
 	    
 	archiveUtf8 = MyStrdup(archive_path);
-#ifdef WINDOWS
+#ifdef UTFCONVERT
 	archiveUtf8 = Convert2UTF8(archiveUtf8);
-#endif // WINDOWS
+#endif // UTFCONVERT
 
 	MyFree(archive);
 
@@ -355,9 +331,9 @@ BOOL_T UnpackArchiveFor(
     long long sum;
 
 	char *destBuffer = MyStrdup(pathName);
-#ifdef WINDOWS
+#ifdef UTFCONVERT
 	destBuffer = Convert2UTF8(destBuffer);
-#endif // WINDOWS
+#endif // UTFCONVERT
 
 
     if ((za = zip_open(destBuffer, 0, &err)) == NULL) {
@@ -408,9 +384,9 @@ BOOL_T UnpackArchiveFor(
                     }
                 }
                 MakeFullpath(&dirName, tempDir, &sb.name[0], NULL);
-#ifdef WINDOWS
+#ifdef UTFCONVERT
 				ConvertUTF8ToSystem(dirName);
-#endif // WINDOWS
+#endif // UTFCONVERT
 				fd = fopen(dirName, "wb");
                 if (!fd) {
                     NoticeMessage(MSG_ZIP_FILE_OPEN_FAIL, _("Continue"), NULL, dirName,
-- 
cgit v1.2.3