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

Timestamp:

Apr 25, 2002, 7:25:16 PM (23 years ago)

Author:

umoeller

Message:

Lots of dialog rework, plus other fixes.

File:

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

trunk/src/helpers/dosh.c

@@ -1942 +1942 @@
  *
  *      In the pathological case of a dot in the path
- *      but not in the filename itself, this correctly
- *      returns NULL.
+ *      but not in the filename itself (e.g.
+ *      "C:\files.new\readme"), this correctly returns
+ *      NULL.
  *
  *@@added V0.9.6 (2000-10-16) [umoeller]
@@ -2008 +2009 @@
     CHAR szName[5];
 
-    APIRET rc              = NO_ERROR; // return code
+    APIRET arc;
     BYTE   fsqBuffer[sizeof(FSQBUFFER2) + (3 * CCHMAXPATH)] = {0};
     ULONG  cbBuffer   = sizeof(fsqBuffer);        // Buffer length)
@@ -2017 +2018 @@
     szName[2] = '\0';
 
-    rc = DosQueryFSAttach(szName,          // logical drive of attached FS
-                          0,               // ulOrdinal, ignored for FSAIL_QUERYNAME
-                          FSAIL_QUERYNAME, // return data for a Drive or Device
-                          pfsqBuffer,      // returned data
-                          &cbBuffer);      // returned data length
-
-    if (rc == NO_ERROR)
+    if (!(arc = DosQueryFSAttach(szName,          // logical drive of attached FS
+                                 0,               // ulOrdinal, ignored for FSAIL_QUERYNAME
+                                 FSAIL_QUERYNAME, // return data for a Drive or Device
+                                 pfsqBuffer,      // returned data
+                                 &cbBuffer)))     // returned data length
     {
         // The data for the last three fields in the FSQBUFFER2
@@ -3434 +3433 @@
 
 /*
+ *@@ doshCanonicalize:
+ *      simplifies path specifications to remove '.'
+ *      and '..' entries and generates a fully
+ *      qualified path name where possible.
+ *      File specifications are left unchanged.
+ *
+ *      This returns:
+ *
+ *      --  NO_ERROR: the buffers were valid.
+ *
+ *      --  ERROR_INVALID_PARAMETER: the buffers
+ *          were invalid.
+ *
+ *@@added V0.9.19 (2002-04-22) [pr]
+ */
+
+APIRET doshCanonicalize(PCSZ pcszFileIn,        // in: path to canonicalize
+                        PSZ pszFileOut,         // out: canonicalized path if NO_ERROR
+                        ULONG cbFileOut)        // in: size of pszFileOut buffer
+{
+    APIRET ulrc = NO_ERROR;
+    CHAR szFileTemp[CCHMAXPATH];
+
+    if (pcszFileIn && pszFileOut && cbFileOut)
+    {
+        strncpy(szFileTemp, pcszFileIn, sizeof(szFileTemp) - 1);
+        szFileTemp[sizeof(szFileTemp) - 1] = 0;
+        if (    strchr(szFileTemp, '\\')
+             || strchr(szFileTemp, ':')
+           )
+        {
+            ULONG cbFileTemp = strlen(szFileTemp);
+
+            if (    (cbFileTemp > 3)
+                 && (szFileTemp[cbFileTemp - 1] == '\\')
+               )
+            {
+                szFileTemp[cbFileTemp - 1] = 0;
+            }
+
+            if (DosQueryPathInfo(szFileTemp,
+                                 FIL_QUERYFULLNAME,
+                                 pszFileOut,
+                                 cbFileOut))
+            {
+                pszFileOut[0] = 0;
+            }
+        }
+        else
+        {
+            strncpy(pszFileOut, pcszFileIn, cbFileOut - 1);
+            pszFileOut[cbFileOut - 1] = 0;
+        }
+    }
+    else
+        ulrc = ERROR_INVALID_PARAMETER;
+
+    return(ulrc);
+}
+
+/*
  *@@category: Helpers\Control program helpers\Module handling
  *      helpers for importing functions from a module (DLL).