Changeset 765

Timestamp:

Aug 5, 2007, 10:17:38 PM (18 years ago)

Author:

Gregg Young

Message:

fix of broken compare dirs uses BldFullPathName for left list and sprintf for right list

Location:

trunk/dll

Files:

• comp.c (modified) (9 diffs)
• filldir.c (modified) (1 diff)

trunk/dll/comp.c

@@ -470 +470 @@
               //sprintf(newname, "%s%s%s",
               //        cmp->rightdir,
-              //        cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\' ?
-              //        NullStr : "\\",
-              //        pci->pszDisplayName);
+             //         cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\' ?
+             //         NullStr : "\\",
+             //         pci->pszDisplayName);
             // Make directory if required
             strcpy(dirname, newname);
@@ -557 +557 @@
               //        cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\' ?
               //        NullStr : "\\",
-              //        pci->pszDisplayName);
+              //         pci->pszDisplayName);
             else
               BldFullPathName(pszNewName, cmp->rightdir, pci->pszDisplayName);
@@ -819 +819 @@
   PSZ pszBuf = szBuf;
   CNRINFO cnri;
+
 
   if (!cmp) {
@@ -1104 +1105 @@
             //        (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
             //        NullStr : "\\", filesl[l]->fname);
-            pcil->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);
+            pcil->pszFileName = xstrdup(pszBuf, pszSrcFile, __LINE__);
             pcil->pszDisplayName = pcil->pszFileName + lenl;
             pcil->attrFile = filesl[l]->attrFile;
@@ -1139 +1140 @@
           if (x >= 0) {
             // File appears on right side
-            BldFullPathName(pszBuf, cmp->rightdir, filesl[r]->fname);
-            //sprintf(szBuf, "%s%s%s", cmp->rightdir,
-            //        (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
-            //        NullStr : "\\", filesr[r]->fname);
-            pcir->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);   // 31 Jul 07 SHL
+            //BldFullPathName(pszBuf, cmp->rightdir, filesl[r]->fname);
+            sprintf(szBuf, "%s%s%s", cmp->rightdir,
+                    (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
+                    NullStr : "\\", filesr[r]->fname);
+            pcir->pszFileName = xstrdup(pszBuf, pszSrcFile, __LINE__);  // 31 Jul 07 SHL
             pcir->pszDisplayName = pcir->pszFileName + lenr;
             pcir->attrFile = filesr[r]->attrFile;
@@ -1180 +1181 @@
           if (x == 0) {
             // File appears on both sides
-            pch = szBuf;
+            pch = pszBuf;
             // Subject field holds status messages
             *pch = 0;
@@ -1210 +1211 @@
               pcil->flags |= CNRITEM_NEWER;
               pcir->flags |= CNRITEM_OLDER;
-              if (pch != szBuf) {
+              if (pch != pszBuf) {
                 strcpy(pch, ", ");
                 pch += 2;
@@ -1232 +1233 @@
               pcil->flags |= CNRITEM_OLDER;
               pcir->flags |= CNRITEM_NEWER;
-              if (pch != szBuf) {
+              if (pch != pszBuf) {
                 strcpy(pch, ", ");
                 pch += 2;
@@ -1240 +1241 @@
             }
             // fixme to know why not displayed - defect?
-            pcil->pszSubject = *szBuf ?
-                                 xstrdup(szBuf, pszSrcFile, __LINE__) :
+            pcil->pszSubject = pszBuf ?
+                                 xstrdup(pszBuf, pszSrcFile, __LINE__) :
                                  NullStr;
 

trunk/dll/filldir.c

@@ -78 +78 @@
   UINT c = strlen(pszPathName);
   if (c > 0) {
-    memcpy(pszFullPathName, pszPathName, c);
+    memcpy(pszFullPathName, pszPathName, c + 1);
     if (pszFullPathName[c] != '\\')
       pszFullPathName[c++] = '\\';