Changeset 739 for trunk/dll/dirsize.c

Timestamp:

Jul 24, 2007, 6:06:59 AM (18 years ago)

Author:

Steven Levine

Message:

More ticket #24 updates

File:

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

trunk/dll/dirsize.c

@@ -147 +147 @@
     else
       DosError(FERR_DISABLEHARDERR);
-    // fixme to not double free when pointers match
-    pci->pszLongname = pci->pszFileName;
     pci->rc.hptrIcon = hptrDir;
     *pci->szDispAttr = 0;
@@ -171 +169 @@
       p = pszFileName;
     else
-      p++;
-    sp = (strchr(pszFileName, ' ') != NULL) ? "\"" : NullStr;
+      p++;                              // After last backslash
+    // Handle quoted names?
+    sp = strchr(pszFileName, ' ') != NULL ? "\"" : NullStr;
+    pci->pszFileName = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);       // fixme to optimize alloc
     pp = pci->pszFileName;
     if (*sp) {
-      *pp = *sp;
+      *pp = *sp;                        // Need quotes
       pp++;
       *pp = 0;
@@ -183 +183 @@
       strcat(pp, sp);
   }
+  pci->pszLongname = pci->pszFileName;
   pci->rc.pszIcon = pci->pszLongname;
   pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
@@ -189 +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);
+  pci->pszDisplayName = pci->pszFileName + strlen(pci->pszFileName);
   memset(&ri, 0, sizeof(RECORDINSERT));
   ri.cb = sizeof(RECORDINSERT);