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

trunk/dll/copyf.c

@@ -21 +21 @@
   19 Jul 08 GKY Modify MakeTempName for use making temp directory names
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -50 +51 @@
 #include "wrappers.h"                   // xDosSetPathInfo
 #include "strips.h"                     // bstrip
-#include "fortify.h"
+#include "fortify.h"                    
+#include "pathutil.h"                   // AddBackslashToPath
 
 static PSZ pszSrcFile = __FILE__;
@@ -75 +77 @@
   char *p, *o;
 
-  if (strlen(buffer) > 3 && buffer[strlen(buffer) - 1] != '\\')
-    strcat(buffer, "\\");
+
+  if (strlen(buffer) > 3) // && buffer[strlen(buffer) - 1] != '\\')
+    AddBackslashToPath(buffer);
+    //strcat(buffer, "\\");
   p = o = buffer + strlen(buffer);
   switch (type) {
@@ -282 +286 @@
 BOOL ZapLongName(char *filename)
 {
-  return WriteLongName(filename, "");
+  return WriteLongName(filename, NullStr);
 }
 
@@ -308 +312 @@
   else
     ealen = sizeof(FEALIST) + 10;
-  rc = DosAllocMem((PPVOID) & pfealist,
-                   ealen + 32L, OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PPVOID) & pfealist,
+                    ealen + 32L, OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
   if (rc)
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -536 +540 @@
       if (IsFile(newname) != -1 && stricmp(oldname, newname)) {
         strcpy(dir, newname);
-        p = strrchr(dir, '\\');
-        if (p)
-          *p = 0;
-        strcat(dir, "\\");
+        AddBackslashToPath(dir);
+        //p = strrchr(dir, '\\');
+        //if (p)
+        //  *p = 0;
+        //strcat(dir, "\\");
         MakeTempName(dir, NULL, 0);
         if (DosMove(newname, dir))