Changeset 730 for trunk/dll/dirsize.c

Timestamp:

Jul 22, 2007, 7:57:09 PM (18 years ago)

Author:

Gregg Young

Message:

Preliminary work on variable sized container buffers. Removes szFileName etc. Builds fine but traps.

File:

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

trunk/dll/dirsize.c

@@ -97 +97 @@
   RECORDINSERT ri;
   PCNRITEM pCI;
+  CHAR *f = 0;
 
   // fixme to report errors
@@ -146 +147 @@
     else
       DosError(FERR_DISABLEHARDERR);
-    pCI->pszLongname = pCI->szFileName;
+    pCI->pszLongname = pCI->pszFileName;
     pCI->rc.hptrIcon = hptrDir;
-    *pCI->szDispAttr = *pCI->szLongname = *pCI->szSubject = 0;
-    pCI->attrFile = 0L;
+    *pCI->szDispAttr = 0;
+    pCI->attrFile = 0;
+    pCI->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
+    pCI->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
   }
   else {
@@ -162 +165 @@
 
   if (strlen(pszFileName) < 4 || top)
-    strcpy(pCI->szFileName, pszFileName);
+   pCI->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
   else {
     p = strrchr(pszFileName, '\\');
@@ -170 +173 @@
       p++;
     sp = (strchr(pszFileName, ' ') != NULL) ? "\"" : NullStr;
-    pp = pCI->szFileName;
+    pp = pCI->pszFileName;
     if (*sp) {
       *pp = *sp;
@@ -180 +183 @@
       strcat(pp, sp);
   }
-  pCI->pszFileName = pCI->szFileName + strlen(pCI->szFileName);
+  pCI->pszFileName = pCI->pszFileName + strlen(pCI->pszFileName);
   pCI->rc.pszIcon = pCI->pszLongname;
   pCI->rc.flRecordAttr |= CRA_RECORDREADONLY;
   if (fForceUpper)
-    strupr(pCI->szFileName);
+    strupr(pCI->pszFileName);
   else if (fForceLower)
-    strlwr(pCI->szFileName);
+    strlwr(pCI->pszFileName);
   memset(&ri, 0, sizeof(RECORDINSERT));
   ri.cb = sizeof(RECORDINSERT);
@@ -293 +296 @@
 
         memset(&fsa, 0, sizeof(fsa));
-        rc = DosQueryFSInfo(toupper(*pCI->szFileName) - '@', FSIL_ALLOC, &fsa,
+        rc = DosQueryFSInfo(toupper(*pCI->pszFileName) - '@', FSIL_ALLOC, &fsa,
                             sizeof(FSALLOCATE));
         if (!rc) {
@@ -299 +302 @@
             ((float)fsa.cUnit * (fsa.cSectorUnit * fsa.cbSector));
         }
-        pCI->szLongname[1] = 1;         // Flag root - hack cough
+        pCI->pszLongname[1] = 1;                // Flag root - hack cough
       }
       else
@@ -319 +322 @@
     CommaFmtULL(szSubDir, sizeof(szSubDir), pCI->easize, 'K');
     CommaFmtULL(szAllDir, sizeof(szAllDir), pCI->cbFile + pCI->easize, 'K');
-    sprintf(&pCI->szFileName[strlen(pCI->szFileName)],
+    sprintf(&pCI->pszFileName[strlen(pCI->pszFileName)],
             "  %s + %s = %s (%.02lf%%%s)\r%s",
             szCurDir,
@@ -355 +358 @@
   }
   if (pciParent) {
-    p = strchr(pciParent->szFileName, '\r');
+    p = strchr(pciParent->pszFileName, '\r');
     if (p)
       *p = 0;
     fprintf(fp, "%*.*s%s %lu %s%s\n",
             indent * 2, indent * 2, " ",
-            pciParent->szFileName,
+            pciParent->pszFileName,
             pciParent->attrFile,
             GetPString(IDS_FILETEXT), &"s"[pciParent->attrFile == 1]);
@@ -588 +591 @@
             LONG clr, x;
 
-            p = strchr(pci->szFileName, '\r');
+            p = strchr(pci->pszFileName, '\r');
             if (p) {
               /* draw text */
@@ -600 +603 @@
               GpiSetMix(oi->hps, FM_OVERPAINT);
               *p = 0;
-              GpiQueryTextBox(oi->hps, strlen(pci->szFileName),
-                              pci->szFileName, TXTBOX_COUNT, aptl);
+              GpiQueryTextBox(oi->hps, strlen(pci->pszFileName),
+                              pci->pszFileName, TXTBOX_COUNT, aptl);
               ptl.x = oi->rclItem.xLeft;
               ptl.y = (oi->rclItem.yTop - aptl[TXTBOX_TOPRIGHT].y);
               GpiMove(oi->hps, &ptl);
-              GpiCharString(oi->hps, strlen(pci->szFileName),
-                            pci->szFileName);
+              GpiCharString(oi->hps, strlen(pci->pszFileName),
+                            pci->pszFileName);
               *p = '\r';
 
@@ -663 +666 @@
               /* fill box with graph bar, flags is integer % */
               if (pci->flags) {
-                if (pci->szLongname[1] == 1)    /* is root record */
+                if (*(pci->pszLongname + 1) == 1)       /* is root record */
                   GpiSetColor(oi->hps, CLR_DARKGREEN);
                 else
@@ -675 +678 @@
 
                 /* draw highlights and shadows on graph */
-                if (pci->szLongname[1] == 1)
+                if (*(pci->pszLongname + 1) == 1)
                   GpiSetColor(oi->hps, CLR_GREEN);
                 else
@@ -692 +695 @@
                 ptl.x = oi->rclItem.xLeft + pci->flags;
                 GpiLine(oi->hps, &ptl);
-                if (pci->szLongname[1] != 1) {
+                if (*(pci->pszLongname + 1) != 1) {
                   GpiSetColor(oi->hps, CLR_DARKRED);
                   ptl.x = oi->rclItem.xLeft + 2;
@@ -752 +755 @@
           while (pci && (INT) pci != -1) {
             memset(szTemp, 0, sizeof(szTemp));
-            strncpy(szTemp, pci->szFileName,
-                    pci->pszFileName - pci->szFileName);
+            strncpy(szTemp, pci->pszFileName,
+                    pci->pszFileName - pci->pszFileName);
             strrev(szTemp);
             if (*pszFileName && *szTemp != '\\')