Changeset 731 for trunk/dll/dirsize.c

Timestamp:

Jul 24, 2007, 1:18:39 AM (18 years ago)

Author:

Steven Levine

Message:

Correct ticket 24 pointer errors for Gregg

File:

• trunk/dll/dirsize.c (modified) (13 diffs)

trunk/dll/dirsize.c

@@ -78 +78 @@
 }
 
-static BOOL ProcessDir(HWND hwndCnr, CHAR * pszFileName,
+static BOOL ProcessDir(HWND hwndCnr,
+                       CHAR *pszFileName,
                        PCNRITEM pciParent,
-                       CHAR * pchStopFlag, BOOL top,
+                       CHAR *pchStopFlag,
+                       BOOL top,
                        PULONGLONG pullTotalBytes)
 {
@@ -97 +99 @@
   RECORDINSERT ri;
   PCNRITEM pCI;
-  CHAR *f = 0;
 
   // fixme to report errors
@@ -147 +148 @@
     else
       DosError(FERR_DISABLEHARDERR);
+    // fixme to not double free when pointers match
     pCI->pszLongname = pCI->pszFileName;
     pCI->rc.hptrIcon = hptrDir;
     *pCI->szDispAttr = 0;
     pCI->attrFile = 0;
-    pCI->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
-    pCI->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
+    pCI->pszSubject = xstrdup(NullStr, pszSrcFile, __LINE__);
   }
   else {
@@ -183 +184 @@
       strcat(pp, sp);
   }
-  pCI->pszFileName = pCI->pszFileName + strlen(pCI->pszFileName);
   pCI->rc.pszIcon = pCI->pszLongname;
   pCI->rc.flRecordAttr |= CRA_RECORDREADONLY;
@@ -190 +190 @@
   else if (fForceLower)
     strlwr(pCI->pszFileName);
+  // fixme to work - code is hiding file name from container but... 23 Jul 07 SHL
+  pCI->pszFileName = pCI->pszFileName + strlen(pCI->pszFileName);
   memset(&ri, 0, sizeof(RECORDINSERT));
   ri.cb = sizeof(RECORDINSERT);
@@ -197 +199 @@
   ri.cRecordsInsert = 1L;
   ri.fInvalidateRecord = TRUE;
-  //printf("CM_INSERTRECORD\n");
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pCI), MPFROMP(&ri))) {
-    //printf("Insert failed\n");
     free(pFFB);
     return FALSE;
@@ -205 +205 @@
   hdir = HDIR_CREATE;
   nm = 1L;
-  //printf("FIND2\n");
   rc = DosFindFirst(maskstr, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
@@ -302 +301 @@
             ((float)fsa.cUnit * (fsa.cSectorUnit * fsa.cbSector));
         }
+        // Need unique buffer 23 Jul 07 SHL
+        pCI->pszLongname = xmalloc(2, pszSrcFile, __LINE__);
+        pCI->pszLongname[0] = 0;                // Make null string
         pCI->pszLongname[1] = 1;                // Flag root - hack cough
       }
@@ -322 +324 @@
     CommaFmtULL(szSubDir, sizeof(szSubDir), pCI->easize, 'K');
     CommaFmtULL(szAllDir, sizeof(szAllDir), pCI->cbFile + pCI->easize, 'K');
-    sprintf(&pCI->pszFileName[strlen(pCI->pszFileName)],
+    pCI->pszFileName = xrealloc(pCI->pszFileName, strlen(pCI->pszFileName) + 100,
+                                pszSrcFile,
+                                __LINE__);      // 23 Jul 07 SHL
+    sprintf(pCI->pszFileName + strlen(pCI->pszFileName),
             "  %s + %s = %s (%.02lf%%%s)\r%s",
             szCurDir,
@@ -747 +752 @@
     case CN_ENTER:
       if (mp2) {
-
-        PCNRITEM pci = (PCNRITEM) ((PNOTIFYRECORDENTER) mp2)->pRecord;
-        CHAR pszFileName[CCHMAXPATH], szTemp[CCHMAXPATH];
+        PCNRITEM pci = (PCNRITEM)((PNOTIFYRECORDENTER)mp2)->pRecord;
+        CHAR szFileName[CCHMAXPATH];    // 23 Jul 07 SHL
+        CHAR szTemp[CCHMAXPATH];
 
         if (pci) {
-          *pszFileName = 0;
+          *szFileName = 0;
           while (pci && (INT) pci != -1) {
             memset(szTemp, 0, sizeof(szTemp));
@@ -758 +763 @@
                     pci->pszFileName - pci->pszFileName);
             strrev(szTemp);
-            if (*pszFileName && *szTemp != '\\')
-              strcat(pszFileName, "\\");
-            strcat(pszFileName, szTemp);
+            if (*szFileName && *szTemp != '\\')
+              strcat(szFileName, "\\");
+            strcat(szFileName, szTemp);
             pci = WinSendDlgItemMsg(hwnd, DSZ_CNR, CM_QUERYRECORD,
                                     MPFROMP(pci),
                                     MPFROM2SHORT(CMA_PARENT, CMA_ITEMORDER));
           }
-          strrev(pszFileName);
+          strrev(szFileName);
           if (!fVTreeOpensWPS)
             OpenDirCnr((HWND) 0,
                        (hwndMain) ? hwndMain : HWND_DESKTOP,
-                       hwnd, FALSE, pszFileName);
+                       hwnd, FALSE, szFileName);
           else {
 
@@ -780 +785 @@
                                 (PVOID) & flWindowAttr, &size);
             if (flWindowAttr & CV_DETAIL) {
-              if (IsRoot(pszFileName))
+              if (IsRoot(szFileName))
                 strcpy(s, "TREE");
               else
                 strcpy(s, "DETAILS");
             }
-            OpenObject(pszFileName, s, hwnd);
+            OpenObject(szFileName, s, hwnd);
           }
         }
@@ -826 +831 @@
       else {
 
-        CHAR pszFileName[CCHMAXPATH];
+        CHAR szFileName[CCHMAXPATH];
         FILE *fp;
 
-        save_dir2(pszFileName);
-        sprintf(&pszFileName[strlen(pszFileName)], "\\%csizes.Rpt",
+        save_dir2(szFileName);
+        sprintf(&szFileName[strlen(szFileName)], "\\%csizes.Rpt",
                 (pState) ? toupper(*pState->szDirName) : '+');
-        if (export_filename(hwnd, pszFileName, FALSE) && *pszFileName) {
-          if (stricmp(pszFileName, "PRN") &&
-              strnicmp(pszFileName, "\\DEV\\LPT", 8) &&
-              !strchr(pszFileName, '.'))
-            strcat(pszFileName, ".RPT");
-          fp = fopen(pszFileName, "a+");
+        if (export_filename(hwnd, szFileName, FALSE) && *szFileName) {
+          if (stricmp(szFileName, "PRN") &&
+              strnicmp(szFileName, "\\DEV\\LPT", 8) &&
+              !strchr(szFileName, '.'))
+            strcat(szFileName, ".RPT");
+          fp = fopen(szFileName, "a+");
           if (!fp) {
             saymsg(MB_CANCEL,
                    hwnd,
                    GetPString(IDS_ERRORTEXT),
-                   GetPString(IDS_COMPCANTOPENTEXT), pszFileName);
+                   GetPString(IDS_COMPCANTOPENTEXT), szFileName);
           }
           else {