Changeset 143

Timestamp:

Oct 24, 2006, 12:47:25 AM (19 years ago)

Author:

dmik

Message:

Common: System Exceptions:

• Fixed: Using HOMEDRIVE/HOMEPATH to point to the home directory didn't work;
• Improved: Paths specified in HOME and HOMEDRIVE/HOMEPATH are resolved to full paths before using.

File:

• trunk/src/tools/qsysxcpt_pm.cpp (modified) (3 diffs)

trunk/src/tools/qsysxcpt_pm.cpp

@@ -65 +65 @@
     - must be instantiated on the stack of the main thread only
     - must be instantiated before a QAplication instance is created
+      (does nothing otherwise)
 */
 
@@ -538 +539 @@
         return NULL;
 
-    strcpy( szFileName, pcszBasePath );
+    // get the full path if it's not 'X:'
+    if ( strlen(pcszBasePath) != 2 ||
+         pcszBasePath[1] != ':' )
+    {
+        if( DosQueryPathInfo( pcszBasePath, FIL_QUERYFULLNAME,
+                              szFileName, cbFileName ) != NO_ERROR )
+            return NULL;
+    }
+    else
+        strcpy( szFileName, pcszBasePath );
+    
     strcat( szFileName, szDir );
     if ( access( szFileName, F_OK ) != 0 )
@@ -696 +707 @@
                      strlen( pszHomeDrive ) + strlen( pszHomePath ) < CCHMAXPATH )
                 {
-                    strcpy( szFileName, pszHomeDrive );
-                    strcat( szFileName, pszHomePath );
-                    file = qt_excOpenLogFile( szFileName, szFileName );
+                    char szHomePath[CCHMAXPATH];
+                    strcpy( szHomePath, pszHomeDrive );
+                    strcat( szHomePath, pszHomePath );
+                    file = qt_excOpenLogFile( szHomePath, szFileName );
                 }
             }