Changeset 63 for trunk/src/helpers/dosh.c

Timestamp:

Apr 25, 2001, 8:55:35 PM (24 years ago)

Author:

umoeller

Message:

Misc. fixes.

File:

• trunk/src/helpers/dosh.c (modified) (8 diffs)

trunk/src/helpers/dosh.c

@@ -346 +346 @@
                     BOOL fSkipRemoveables) // in: if TRUE, only non-removeable disks will be returned
 {
-    CHAR szName[5] = "";
-    ULONG ulLogicalDrive = 1, // start with drive A:
-          ulFound = 0;        // found drives count
-    APIRET arc             = NO_ERROR; // return code
+    CHAR    szName[5] = "";
+    ULONG   ulLogicalDrive = 1, // start with drive A:
+            ulFound = 0;        // found drives count
+    APIRET  arc = NO_ERROR; // return code
 
     if (fSkipRemoveables)
@@ -379 +379 @@
                           1,
                           &dataLen);
-
-        /* _Pmpf(("  ul = %d, Drive %c: arc = %d nonRemoveable = %d",
-                    ulLogicalDrive,
-                    G_acDriveLetters[ulLogicalDrive],
-                    arc,
-                    nonRemovable)); */
 
         if (    // fixed disk and non-removeable
@@ -471 +465 @@
  *@@changed V0.9.4 (2000-08-03) [umoeller]: more network fixes
  *@@changed V0.9.9 (2001-03-19) [pr]: validate drive number
+ *@@changed V0.9.11 (2001-04-23) [umoeller]: added an extra check for floppies
  */
 
@@ -517 +512 @@
             // sigh...
         case ERROR_NOT_SUPPORTED: // 50
-        {
             // this is returned by file systems which don't
             // support DASD DosOpen;
             // use some other method then, this isn't likely
             // to fail -- V0.9.1 (2000-02-09) [umoeller]
-            FSALLOCATE  fsa;
-            arc = DosQueryFSInfo(ulLogicalDrive,
-                                 FSIL_ALLOC,
-                                 &fsa,
-                                 sizeof(fsa));
-        break; }
+
+            // but don't do this for floppies
+            // V0.9.11 (2001-04-23) [umoeller]
+            if (ulLogicalDrive > 2)
+            {
+                FSALLOCATE  fsa;
+                arc = DosQueryFSInfo(ulLogicalDrive,
+                                     FSIL_ALLOC,
+                                     &fsa,
+                                     sizeof(fsa));
+            }
+        break;
 
         case NO_ERROR:
@@ -554 +554 @@
             paramsize = 0,
             datasize = 0;
-    APIRET    rc = NO_ERROR;
-    USHORT    data,
-              param;
+    APIRET  rc = NO_ERROR;
+    USHORT  data,
+            param;
 
     name[0] = doshQueryBootDrive();
@@ -802 +802 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V0.9.11 (2001-04-22) [umoeller]: this copied even with errors, fixed
  */
 
@@ -820 +821 @@
                          sizeof(FSInfoBuf)); // depends
 
-    #ifdef __OS2V2X__
-        strcpy(pszVolumeLabel, FSInfoBuf.szVolLabel);
-    #else
-        strcpy(pszVolumeLabel, FSInfoBuf.vol.szVolLabel);
-    #endif
+    if (!arc)       // V0.9.11 (2001-04-22) [umoeller]
+    {
+        #ifdef __OS2V2X__
+            strcpy(pszVolumeLabel, FSInfoBuf.szVolLabel);
+        #else
+            strcpy(pszVolumeLabel, FSInfoBuf.vol.szVolLabel);
+        #endif
+    }
 
     return (arc);
@@ -1023 +1027 @@
  *      --  FILE_HIDDEN
  *
- *      This returns the APIRET of DosQueryPathAttr.
+ *      This returns the APIRET of DosQueryPathInfo.
  *      *pulAttr is only valid if NO_ERROR is
  *      returned.