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

trunk/dll/worker.c

@@ -41 +41 @@
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
   08 Mar 09 GKY Additional strings move to PCSZs
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -230 +231 @@
             }
             else
-              strcat(wk->li->targetpath, "\\");
+              strcat(wk->li->targetpath, PCSZ_BACKSLASH);
             sprintf(wk->li->targetpath + strlen(wk->li->targetpath),
                     "MERGE.%03x", (clock() & 4095L));
@@ -708 +709 @@
                       GetPString(IDS_MOVEDTEXT) : GetPString(IDS_COPIEDTEXT);
                     if (*wk->li->targetpath) {
-                      strcpy(newname, wk->li->targetpath);
-                      if (newname[strlen(newname) - 1] != '\\')
-                        strcat(newname, "\\");
+                      strcpy(newname, wk->li->targetpath);
+                      AddBackslashToPath(newname);
+                      //if (newname[strlen(newname) - 1] != '\\')
+                      //  strcat(newname, "\\");
                       if (plen)
                         p = wk->li->list[x] + plen;
@@ -1209 +1211 @@
               if (wk->li->type == IDM_MCIPLAY)
                 break;
-              strcpy(szBuffer, wk->li->targetpath);
-              if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] != '\\')
-                strcat(szBuffer, "\\");
+              strcpy(szBuffer, wk->li->targetpath);
+              AddBackslashToPath(wk->li->targetpath);
+              //if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] != '\\')
+              //  strcat(szBuffer, "\\");
               p = szBuffer + strlen(szBuffer);
               for (x = 0; wk->li->list[x]; x++) {
@@ -1270 +1273 @@
               }
               else {
-                if (*wk->li->targetpath && !IsFile(wk->li->targetpath))
-                  if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] !=
-                      '\\')
-                    strcat(wk->li->targetpath, "\\");
+                if (*wk->li->targetpath && !IsFile(wk->li->targetpath))
+                  AddBackslashToPath(wk->li->targetpath);
+                  //if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] !=
+                  //    '\\')
+                  //  strcat(wk->li->targetpath, "\\");
                 ad.namecanchange = 1;
               }
@@ -1298 +1302 @@
                 break;
               if (!*wk->li->targetpath && *wk->directory) {
-                strcpy(ad.arcname, wk->directory);
-                if (ad.arcname[strlen(ad.arcname) - 1] != '\\')
-                  strcat(ad.arcname, "\\");
+                strcpy(ad.arcname, wk->directory);
+                AddBackslashToPath(ad.arcname);
+                //if (ad.arcname[strlen(ad.arcname) - 1] != '\\')
+                //  strcat(ad.arcname, "\\");
               }
               if (!WinDlgBox(HWND_DESKTOP, wk->hwndFrame, ArchiveDlgProc, FM3ModHandle,
@@ -1636 +1641 @@
                                              wk->li->
                                              list[x][strlen(wk->li->list[x]) - 1]
-                                             != '\\') ? "\\" : NullStr);
+                                             != '\\') ? PCSZ_BACKSLASH : NullStr);
                   DosError(FERR_DISABLEHARDERR);
                   if (!error)