Changeset 14 for trunk/src/helpers/dosh2.c

Timestamp:

Dec 9, 2000, 8:19:42 PM (25 years ago)

Author:

umoeller

Message:

Major updates; timers, LVM, miscellaneous.

File:

• trunk/src/helpers/dosh2.c (modified) (12 diffs)

trunk/src/helpers/dosh2.c

@@ -30 +30 @@
  *      This file Copyright (C) 1997-2000 Ulrich M”ller,
  *                                        Dmitry A. Steklenev.
- *      This file is part of the XWorkplace source package.
- *      XWorkplace is free software; you can redistribute it and/or modify
+ *      This file is part of the "XWorkplace helpers" source package.
+ *      This 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, in version 2 as it comes in the
@@ -46 +46 @@
     // as unsigned char
 
+#define INCL_DOSMODULEMGR
+#define INCL_DOSPROCESS
+#define INCL_DOSSESMGR
+#define INCL_DOSQUEUES
+#define INCL_DOSMISC
+#define INCL_DOSDEVICES
 #define INCL_DOSDEVIOCTL
-#define INCL_DOS
 #define INCL_DOSERRORS
-// #define INCL_GPI
 #include <os2.h>
+
 #include <stdlib.h>
 #include <string.h>
@@ -68 +73 @@
 
 /* ******************************************************************
- *                                                                  *
- *   Miscellaneous                                                  *
- *                                                                  *
+ *
+ *   Miscellaneous
+ *
  ********************************************************************/
 
@@ -109 +114 @@
                            BOOL fFullyQualified)    // in: if TRUE, pcszFile must be fully q'fied
 {
+    APIRET  arc = NO_ERROR;
     CHAR    szPath[CCHMAXPATH+4] = " :";
     CHAR    szComponent[CCHMAXPATH];
@@ -120 +126 @@
              || (*(pcszFile + 2) != '\\')
            )
-            return (ERROR_CURRENT_DIRECTORY);
+            arc = ERROR_CURRENT_DIRECTORY;
     }
 
@@ -127 +133 @@
     {
         CHAR cDrive = toupper(*pcszFile);
+        double d;
         // drive specified:
         strcpy(szPath, pcszFile);
         szPath[0] = toupper(*pcszFile);
-        if (doshQueryDiskFree(cDrive - 'A' + 1) == -1)
-            return (ERROR_INVALID_DRIVE);
+        arc = doshQueryDiskFree(cDrive - 'A' + 1, &d);
     }
     else
@@ -138 +144 @@
         ULONG   ulDriveNum = 0,
                 ulDriveMap = 0;
-        DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+        arc = DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
         szPath[0] = ((UCHAR)ulDriveNum) + 'A' - 1;
         szPath[1] = ':';
@@ -144 +150 @@
     }
 
-    fIsFAT = doshIsFileOnFAT(szPath);
-
-    pszInvalid = (fIsFAT)
-                    ? "<>|+=:;,\"/[] "  // invalid characters in FAT
-                    : "<>|:\"/";        // invalid characters in IFS's
-
-    // now separate path components
-    p1 = &szPath[2];       // advance past ':'
-
-    do {
-
-        if (*p1 == '\\')
-            p1++;
-
-        p2 = strchr(p1, '\\');
-        if (p2 == NULL)
-            p2 = p1 + strlen(p1);
-
-        if (p1 != p2)
-        {
-            LONG    lDotOfs = -1,
-                    lAfterDot = -1;
-            ULONG   cbFile,
-                    ul;
-            PSZ     pSource = szComponent;
-
-            strncpy(szComponent, p1, p2-p1);
-            szComponent[p2-p1] = 0;
-            cbFile = strlen(szComponent);
-
-            // now check each path component
-            for (ul = 0; ul < cbFile; ul++)
+    if (arc == NO_ERROR)
+    {
+        fIsFAT = doshIsFileOnFAT(szPath);
+
+        pszInvalid = (fIsFAT)
+                        ? "<>|+=:;,\"/[] "  // invalid characters in FAT
+                        : "<>|:\"/";        // invalid characters in IFS's
+
+        // now separate path components
+        p1 = &szPath[2];       // advance past ':'
+
+        do {
+
+            if (*p1 == '\\')
+                p1++;
+
+            p2 = strchr(p1, '\\');
+            if (p2 == NULL)
+                p2 = p1 + strlen(p1);
+
+            if (p1 != p2)
             {
+                LONG    lDotOfs = -1,
+                        lAfterDot = -1;
+                ULONG   cbFile,
+                        ul;
+                PSZ     pSource = szComponent;
+
+                strncpy(szComponent, p1, p2-p1);
+                szComponent[p2-p1] = 0;
+                cbFile = strlen(szComponent);
+
+                // now check each path component
+                for (ul = 0; ul < cbFile; ul++)
+                {
+                    if (fIsFAT)
+                    {
+                        // on FAT: only 8 characters allowed before dot
+                        if (*pSource == '.')
+                        {
+                            lDotOfs = ul;
+                            lAfterDot = 0;
+                            if (ul > 7)
+                                return (ERROR_FILENAME_EXCED_RANGE);
+                        }
+                    }
+                    // and check for invalid characters
+                    if (strchr(pszInvalid, *pSource) != NULL)
+                        return (ERROR_INVALID_NAME);
+
+                    pSource++;
+
+                    // on FAT, allow only three chars after dot
+                    if (fIsFAT)
+                        if (lAfterDot != -1)
+                        {
+                            lAfterDot++;
+                            if (lAfterDot > 3)
+                                return (ERROR_FILENAME_EXCED_RANGE);
+                        }
+                }
+
+                // we are still missing the case of a FAT file
+                // name without extension; if so, check whether
+                // the file stem is <= 8 chars
                 if (fIsFAT)
-                {
-                    // on FAT: only 8 characters allowed before dot
-                    if (*pSource == '.')
-                    {
-                        lDotOfs = ul;
-                        lAfterDot = 0;
-                        if (ul > 7)
+                    if (lDotOfs == -1)  // dot not found:
+                        if (cbFile > 8)
                             return (ERROR_FILENAME_EXCED_RANGE);
-                    }
-                }
-                // and check for invalid characters
-                if (strchr(pszInvalid, *pSource) != NULL)
-                    return (ERROR_INVALID_NAME);
-
-                pSource++;
-
-                // on FAT, allow only three chars after dot
-                if (fIsFAT)
-                    if (lAfterDot != -1)
-                    {
-                        lAfterDot++;
-                        if (lAfterDot > 3)
-                            return(ERROR_FILENAME_EXCED_RANGE);
-                    }
             }
 
-            // we are still missing the case of a FAT file
-            // name without extension; if so, check whether
-            // the file stem is <= 8 chars
-            if (fIsFAT)
-                if (lDotOfs == -1)  // dot not found:
-                    if (cbFile > 8)
-                        return (ERROR_FILENAME_EXCED_RANGE);
-        }
-
-        // go for next component
-        p1 = p2+1;
-    } while (*p2);
-
-    return (NO_ERROR);
+            // go for next component
+            p1 = p2+1;
+        } while (*p2);
+    }
+
+    return (arc);
 }
 
@@ -340 +349 @@
 
 /* ******************************************************************
- *                                                                  *
- *   Environment helpers                                            *
- *                                                                  *
+ *
+ *   Environment helpers
+ *
  ********************************************************************/
 
@@ -716 +725 @@
 
 /* ******************************************************************
- *                                                                  *
- *   Module handling helpers                                        *
- *                                                                  *
+ *
+ *   Module handling helpers
+ *
  ********************************************************************/
 
@@ -773 +782 @@
 
 /********************************************************************
- *                                                                  *
- *   Executable functions                                           *
- *                                                                  *
+ *
+ *   Executable functions
+ *
  ********************************************************************/
 
@@ -1219 +1228 @@
 
 /********************************************************************
- *                                                                  *
- *   Partition functions                                            *
- *                                                                  *
+ *
+ *   Partition functions
+ *
  ********************************************************************/