Changeset 1438 for trunk/dll/dirsize.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/dirsize.c (modified) (5 diffs)

trunk/dll/dirsize.c

@@ -45 +45 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -85 +86 @@
 #include "fortify.h"
 #include "excputil.h"                   // xbeginthread
+#include "pathutil.h"                   // AddBackslashToPath
 
 typedef struct
@@ -151 +153 @@
 
   strcpy(maskstr, pszFileName);
-  if (maskstr[strlen(maskstr) - 1] != '\\')
-    strcat(maskstr, "\\");
+  AddBackslashToPath(maskstr);
+  //if (maskstr[strlen(maskstr) - 1] != '\\')
+  //  strcat(maskstr, "\\");
   pEndMask = &maskstr[strlen(maskstr)]; // Point after last backslash
   strcat(maskstr, "*");
@@ -873 +876 @@
             memset(szTemp, 0, sizeof(szTemp));
             strcpy(szTemp, pci->pszFileName);
-            strrev(szTemp);
-            if (*szFileName && *szTemp != '\\')
-              strcat(szFileName, "\\");
+            strrev(szTemp);
+            AddBackslashToPath(szFileName);
+            //if (*szFileName && *szTemp != '\\')
+            //  strcat(szFileName, "\\");
             strcat(szFileName, szTemp);
             pci = WinSendDlgItemMsg(hwnd, DSZ_CNR, CM_QUERYRECORD,
@@ -951 +955 @@
         else
           strcpy(szFileName, pFM2SaveDirectory);
-        sprintf(&szFileName[strlen(szFileName)], "\\%csizes.Rpt",
+        sprintf(&szFileName[strlen(szFileName)], "%s%csizes.Rpt", PCSZ_BACKSLASH,
                 (pState) ? toupper(*pState->szDirName) : '+');
         if (export_filename(hwnd, szFileName, FALSE) && *szFileName) {