From 52fae99931beeb132165fa53ce89770e62d18754 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 12 Mar 2021 00:09:11 +0000
Subject: [PATCH] Merge OS/2 files code.

---
 setter/src/os2/32bit/files.c       | 99 ------------------------------
 setter/src/os2/{16bit => }/files.c | 15 +++--
 2 files changed, 7 insertions(+), 107 deletions(-)
 delete mode 100644 setter/src/os2/32bit/files.c
 rename setter/src/os2/{16bit => }/files.c (88%)

diff --git a/setter/src/os2/32bit/files.c b/setter/src/os2/32bit/files.c
deleted file mode 100644
index 73ea40e..0000000
--- a/setter/src/os2/32bit/files.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-Aaru Data Preservation Suite
------------------------------------------------------------------------------
-
-Filename       : os2_32.c
-Author(s)      : Natalia Portillo
-
---[ Description ] -----------------------------------------------------------
-
-Contains 32-bit OS/2 code
-
---[ License ] ---------------------------------------------------------------
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as
-     published by the Free Software Foundation, either version 3 of the
-     License, or (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
------------------------------------------------------------------------------
-Copyright (C) 2011-2021 Natalia Portillo
-*****************************************************************************/
-
-#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386)) &&                             \
-    (defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
-#define INCL_DOSMISC
-#define INCL_DOSFILEMGR
-
-#include <os2.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../os2.h"
-#include "include/consts.h"
-#include "include/defs.h"
-
-void MillionFiles(const char* path)
-{
-    char          drivePath[4];
-    APIRET        rc = 0;
-    char          filename[9];
-    unsigned long pos         = 0;
-    ULONG         actionTaken = 0;
-    HFILE         handle;
-
-    drivePath[0] = path[0];
-    drivePath[1] = ':';
-    drivePath[2] = '\\';
-    drivePath[3] = 0;
-
-    rc = DosSetCurrentDir(drivePath);
-
-    if(rc)
-    {
-        printf("Cannot change to specified path, not continuing.\n");
-        return;
-    }
-
-    rc = DosCreateDir("MILLION", NULL);
-
-    if(rc)
-    {
-        printf("Cannot create working directory.\n");
-        return;
-    }
-
-    rc = DosSetCurrentDir("MILLION");
-
-    printf("Creating lots of files.\n");
-
-    for(pos = 0; pos < 1000; pos++)
-    {
-        memset(&filename, 0, 9);
-        sprintf(&filename, "%08lu", pos);
-        rc = DosOpen(&filename,
-                     &handle,
-                     &actionTaken,
-                     0,
-                     FILE_NORMAL,
-                     OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_FAIL_IF_EXISTS,
-                     OPEN_FLAGS_NOINHERIT | OPEN_FLAGS_NO_CACHE | OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
-                     0);
-        if(rc) break;
-
-        DosClose(handle);
-    }
-
-    printf("\tCreated %lu files\n", pos);
-}
-
-#endif
diff --git a/setter/src/os2/16bit/files.c b/setter/src/os2/files.c
similarity index 88%
rename from setter/src/os2/16bit/files.c
rename to setter/src/os2/files.c
index 94f3a9d..7cdc800 100644
--- a/setter/src/os2/16bit/files.c
+++ b/setter/src/os2/files.c
@@ -27,8 +27,7 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
-    !defined(__DOS__)
+#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
 
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
@@ -38,17 +37,17 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <stdlib.h>
 #include <string.h>
 
-#include "../os2.h"
 #include "include/consts.h"
 #include "include/defs.h"
+#include "os2.h"
 
 void MillionFiles(const char* path)
 {
     char          drivePath[4];
-    USHORT        rc = 0;
+    APIRET        rc = 0;
     char          filename[9];
     unsigned long pos         = 0;
-    USHORT        actionTaken = 0;
+    ACTION_RET    actionTaken = 0;
     HFILE         handle;
 
     drivePath[0] = path[0];
@@ -56,7 +55,7 @@ void MillionFiles(const char* path)
     drivePath[2] = '\\';
     drivePath[3] = 0;
 
-    rc = DosChDir(drivePath, 0);
+    rc = __os2_chdir(drivePath);
 
     if(rc)
     {
@@ -64,7 +63,7 @@ void MillionFiles(const char* path)
         return;
     }
 
-    rc = DosMkDir("MILLION", 0);
+    rc = __os2_mkdir("MILLION");
 
     if(rc)
     {
@@ -72,7 +71,7 @@ void MillionFiles(const char* path)
         return;
     }
 
-    rc = DosChDir("MILLION", 0);
+    rc = __os2_chdir("MILLION");
 
     printf("Creating lots of files.\n");