Implement call for FAT32 GetDiskFreeEx() for DJGPP.

setter/src/dos/CMakeLists.txt

@@ -6,7 +6,7 @@ project(fssetter-dos
         DESCRIPTION "Filesystem test creator for DOS"
         LANGUAGES C)
 
-set(PLATFORM_SOURCES attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c rsrcfork.c sparse.c time.c volume.c xattr.c)
+set(PLATFORM_SOURCES attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c rsrcfork.c sparse.c time.c volume.c xattr.c dos.c)
 
 set(EXECUTABLE_NAME "fssetter")
 

setter/src/dos/dos.c

@@ -0,0 +1,142 @@
+/****************************************************************************
+Aaru Data Preservation Suite
+-----------------------------------------------------------------------------
+
+Filename       : dos.h
+Author(s)      : Natalia Portillo
+
+--[ Description ] -----------------------------------------------------------
+
+Contains DOS definitions
+
+--[ 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
+*****************************************************************************/
+
+#include <errno.h>
+
+#if defined(__WATCOM__)
+#include <i86.h>
+#include <stdlib.h>
+#include <string.h>
+#elif defined(__DJGPP__)
+#include <dpmi.h>
+#include <sys/movedata.h>
+#include <go32.h>
+#endif
+
+#include "dos.h"
+
+unsigned int _dos_getdiskfree_ex(unsigned int drive, struct diskfree_ex_t *diskspace)
+{
+#if defined(__WATCOM__)
+    char              drivePath[4];
+    union REGS        regs;
+    struct SREGS      sregs;
+    struct diskfree_ex_t *copy;
+
+    copy = malloc(sizeof(struct diskfree_ex_t));
+
+    if(!copy)
+    {
+        errno = ENOMEM;
+        return -1;
+    }
+
+    memcpy(copy, diskspace, sizeof(struct diskfree_ex_t));
+
+    drivePath[0] = (drive & 0xFF) + '@';
+    drivePath[1] = ':';
+    drivePath[2] = '\\';
+    drivePath[3] = 0;
+
+    regs.w.ax = 0x7303;
+    sregs.ds  = FP_SEG(drivePath);
+    regs.w.dx = FP_OFF(drivePath);
+    sregs.es  = FP_SEG(copy);
+    regs.w.di = FP_OFF(copy);
+    regs.w.cx = sizeof(struct diskfree_ex_t);
+
+    int86x(0x21, &regs, &regs, &sregs);
+
+    if(regs.h.al == 0 && !regs.w.cflag)
+    {
+        free(copy);
+        errno = ENOSYS;
+        return -1;
+    }
+    else if(regs.w.cflag)
+    {
+        free(copy);
+        errno = EINVAL;
+        _doserrno = regs.w.ax;
+        return -1;
+    }
+
+    memcpy(diskspace, copy, sizeof(struct diskfree_ex_t));
+
+    free(copy);
+    errno = 0;
+    _doserrno = regs.w.ax;
+
+    return 0;
+#elif defined(__DJGPP__)
+    char              drivePath[4];
+    __dpmi_regs regs;
+
+    drivePath[0] = (drive & 0xFF) + '@';
+    drivePath[1] = ':';
+    drivePath[2] = '\\';
+    drivePath[3] = 0;
+
+    // Use transferBuffer[0] for drivePath and transferBuffer[16] for diskfree_ex_t
+    dosmemput(drivePath, 0, __tb);
+
+    regs.x.ds =
+
+    regs.x.ax = 0x7303;
+    regs.x.ds  = __tb >> 4;
+    regs.x.dx = __tb & 0x0F;
+    regs.x.es  = (__tb + 16) >> 4;
+    regs.x.di = (__tb + 16) & 0x0F;
+    regs.x.cx = sizeof(struct diskfree_ex_t);
+
+    __dpmi_int (0x21, &regs);
+
+  if(regs.h.al == 0 && !(regs.x.flags & 1))
+  {
+    errno = ENOSYS;
+    return -1;
+  }
+  else if(regs.x.flags & 1)
+  {
+    errno = EINVAL;
+    _doserrno = regs.x.ax;
+    return -1;
+  }
+
+    dosmemget(__tb + 16, sizeof(struct diskfree_ex_t), diskspace);
+
+    errno = 0;
+    _doserrno = regs.x.ax;
+
+    return 0;
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}

setter/src/dos/dos.h

@@ -42,7 +42,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #pragma pack(__push, 1)
 
-typedef struct _Fat32FreeSpace
+typedef struct diskfree_ex_t
 {
     unsigned short size;
     unsigned short version;
@@ -55,7 +55,9 @@ typedef struct _Fat32FreeSpace
     unsigned long  freeUnits;
     unsigned long  totalUnits;
     unsigned char  reserved[8];
-} Fat32FreeSpace;
+};
+
+unsigned int _dos_getdiskfree_ex(unsigned int drive, struct diskfree_ex_t *diskspace);
 
 #pragma pack(__pop)
 

setter/src/dos/volume.c

@@ -29,79 +29,61 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
 #include <io.h>
-#include <malloc.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
-#if defined(__WATCOM__)
-#include <i86.h>
-#endif
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "../include/dosos2.h"
 #include "dos.h"
 
 void GetVolumeInfo(const char* path, size_t* clusterSize)
 {
-    union REGS        regs;
-    struct SREGS      sregs;
-    char              drivePath[4];
     char              driveNo = path[0] - '@';
     struct diskfree_t oldFreeSpace;
-    Fat32FreeSpace*   freeSpace = malloc(sizeof(Fat32FreeSpace));
+    struct diskfree_ex_t   freeSpace;
+    unsigned int ret;
 
-    memset(freeSpace, 0, sizeof(Fat32FreeSpace));
+    memset(&oldFreeSpace, 0, sizeof(struct diskfree_t));
+    memset(&freeSpace, 0, sizeof(struct diskfree_ex_t));
 
     if(driveNo > 32) driveNo -= 32;
 
-    drivePath[0] = path[0];
-    drivePath[1] = ':';
-    drivePath[2] = '\\';
-    drivePath[3] = 0;
+    ret = _dos_getdiskfree_ex(driveNo, &freeSpace);
 
-    regs.w.ax = 0x7303;
-    sregs.ds  = FP_SEG(drivePath);
-    regs.w.dx = FP_OFF(drivePath);
-    sregs.es  = FP_SEG(freeSpace);
-    regs.w.di = FP_OFF(freeSpace);
-    regs.w.cx = sizeof(Fat32FreeSpace);
-
-    int86x(0x21, &regs, &regs, &sregs);
-
-    if(regs.h.al == 0 && !regs.w.cflag)
+    if(ret)
     {
-        _dos_getdiskfree(driveNo, &oldFreeSpace);
-        freeSpace->sectorsPerCluster = oldFreeSpace.sectors_per_cluster;
-        freeSpace->freeClusters      = oldFreeSpace.avail_clusters;
-        freeSpace->bytesPerSector    = oldFreeSpace.bytes_per_sector;
-        freeSpace->totalClusters     = oldFreeSpace.total_clusters;
-    }
-    else if(regs.w.cflag)
-    {
-        printf("Error %d requesting volume information.\n", regs.w.ax);
-        free(freeSpace);
-        return;
+        if(errno == ENOSYS)
+        {
+          ret = _dos_getdiskfree(driveNo, &oldFreeSpace);
+          freeSpace.sectorsPerCluster = oldFreeSpace.sectors_per_cluster;
+          freeSpace.freeClusters      = oldFreeSpace.avail_clusters;
+          freeSpace.bytesPerSector    = oldFreeSpace.bytes_per_sector;
+          freeSpace.totalClusters     = oldFreeSpace.total_clusters;
+        }
+        else
+        {
+          printf("Error %d requesting volume information.\n", _doserrno);
+          return;
+        }
     }
 
-    if(!regs.w.cflag)
+    if(ret == 0)
     {
-        printf("\tBytes per sector: %lu\n", freeSpace->bytesPerSector);
+        printf("\tBytes per sector: %lu\n", freeSpace.bytesPerSector);
         printf("\tSectors per cluster: %lu (%lu bytes)\n",
-               freeSpace->sectorsPerCluster,
-               freeSpace->sectorsPerCluster * freeSpace->bytesPerSector);
+               freeSpace.sectorsPerCluster,
+               freeSpace.sectorsPerCluster * freeSpace.bytesPerSector);
         printf("\tClusters: %lu (%lu bytes)\n",
-               freeSpace->totalClusters,
-               freeSpace->sectorsPerCluster * freeSpace->bytesPerSector * freeSpace->totalClusters);
+               freeSpace.totalClusters,
+               freeSpace.sectorsPerCluster * freeSpace.bytesPerSector * freeSpace.totalClusters);
         printf("\tFree clusters: %lu (%lu bytes)\n",
-               freeSpace->freeClusters,
-               freeSpace->sectorsPerCluster * freeSpace->bytesPerSector * freeSpace->freeClusters);
+               freeSpace.freeClusters,
+               freeSpace.sectorsPerCluster * freeSpace.bytesPerSector * freeSpace.freeClusters);
 
-        *clusterSize = freeSpace->sectorsPerCluster * freeSpace->bytesPerSector;
+        *clusterSize = freeSpace.sectorsPerCluster * freeSpace.bytesPerSector;
     }
 }