Changeset 45 for trunk/dll

Timestamp:

Feb 12, 2003, 9:12:47 PM (23 years ago)

Author:

root

Message:

docopyf - don't forget to terminate longname, optimize longname logic

File:

• trunk/dll/copyf.c (modified) (3 diffs)

trunk/dll/copyf.c

@@ -11 +11 @@
   Revisions     14 Sep 02 SHL - Drop obsolete debug code
                 14 Oct 02 SHL - Drop obsolete debug code
+                10 Nov 02 SHL - docopyf - don't forget to terminate longname
+                                          optimize longname logic
 
 ***********************************************************************/
@@ -439 +441 @@
   va_list     ap;
 
-  *fullnewname = *longname = *shortname = *dir = 0;
+  *fullnewname = *shortname = *dir = 0;
 
   va_start(ap,
@@ -466 +468 @@
   olddisk = toupper(*oldname);        /* source drive */
   newdisk = toupper(*fullnewname);    /* destination drive */
-  GetLongName(oldname,
-              longname);
-  if(*longname) {
-    if(!(driveflags[toupper(*oldname) - 'A'] & DRIVE_NOLONGNAMES))
-      *longname = 0;
-    else {
+  if(!(driveflags[toupper(*oldname) - 'A'] & DRIVE_NOLONGNAMES))
+    *longname = 0;
+  else
+  {
+    GetLongName(oldname, longname);
+    if(*longname) {
       p = RootName(longname);
       if(p != longname)
-        memmove(longname,
-                p,
-                strlen(p));
-    }
-    /* did root name change? */
-    p = RootName(oldname);
-    pp = RootName(fullnewname);
-    if(stricmp(p,
-               pp))
-    {
+        memmove(longname, p, strlen(p) + 1);
+    }
+  }
+  /* If root name changed make sure longname EA goes away */
+  p = RootName(oldname);
+  pp = RootName(fullnewname);
+  if(stricmp(p, pp))
+  {
 #ifdef DEBUG
-      saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"oldname: %s\rnewname: %s",oldname,fullnewname);        // fixme to be gone
+    saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"oldname: %s\rnewname: %s",oldname,fullnewname);  // fixme to be gone
 #endif
-      zaplong = TRUE;
-    }
+    zaplong = TRUE;
   }