Changeset 1438 for trunk/dll/walkem.c

Timestamp:

Jun 28, 2009, 10:47:00 PM (16 years ago)

Author:

Gregg Young

Message:

Improved drivebar changes; Added AddBackslashToPath() to remove repeatative code. replaced "
" with PCSZ variable; ANY_OBJ added the DosAlloc... (experimental)

File:

• trunk/dll/walkem.c (modified) (5 diffs)

trunk/dll/walkem.c

@@ -34 +34 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -681 +682 @@
     sprintf(szTemp,
             "%s%s*",
-            pszPath, (pszPath[strlen(pszPath) - 1] == '\\') ? "" : "\\");
+            pszPath, (pszPath[strlen(pszPath) - 1] == '\\') ? NullStr : PCSZ_BACKSLASH);
     DosError(FERR_DISABLEHARDERR);
     if (!DosFindFirst(szTemp,
@@ -1146 +1147 @@
         bstrip(szBuffer);
         if (*szBuffer) {
-          strcpy(szBuff, wa->szCurrentPath);
-          if (szBuff[strlen(szBuff) - 1] != '\\')
-            strcat(szBuff, "\\");
+          strcpy(szBuff, wa->szCurrentPath);
+          AddBackslashToPath(szBuff);
+          //if (szBuff[strlen(szBuff) - 1] != '\\')
+          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);
@@ -1539 +1541 @@
         bstrip(szBuffer);
         if (*szBuffer) {
-          strcpy(szBuff, wa->szCurrentPath1);
-          if (szBuff[strlen(szBuff) - 1] != '\\')
-            strcat(szBuff, "\\");
+          strcpy(szBuff, wa->szCurrentPath1);
+          AddBackslashToPath(szBuff);
+          //if (szBuff[strlen(szBuff) - 1] != '\\')
+          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);
@@ -1604 +1607 @@
         bstrip(szBuffer);
         if (*szBuffer) {
-          strcpy(szBuff, wa->szCurrentPath2);
-          if (szBuff[strlen(szBuff) - 1] != '\\')
-            strcat(szBuff, "\\");
+          strcpy(szBuff, wa->szCurrentPath2);
+          AddBackslashToPath(szBuff);
+          //if (szBuff[strlen(szBuff) - 1] != '\\')
+          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);