Changeset 123 for trunk/dll/arccnrs.c

Timestamp:

Dec 5, 2004, 1:20:19 AM (21 years ago)

Author:

root

Message:

Rework lstrip/rstrip usage

File:

• trunk/dll/arccnrs.c (modified) (6 diffs)

trunk/dll/arccnrs.c

@@ -4 +4 @@
   $Id$
 
+  Archive containers
+
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2002 Steven H.Levine
-
-  Archive containers
+  Copyright (c) 2001, 2004 Steven H.Levine
 
   Revisions     11 Jun 02 SHL - Ensure archive name not garbage
                 22 May 03 SHL - ArcObjWndProc: fix UM_RESCAN now that we understand it
+                01 Aug 04 SHL - Rework lstrip/rstrip usage
 
 ***********************************************************************/
@@ -397 +398 @@
         else {    /* add to container */
           fname = NULL;
-          lstrip(rstrip(s));
+          bstrip(s);
           if(info->nameisfirst) {
             strncpy(lonename,s,CCHMAXPATH + 2);
@@ -405 +406 @@
               break;
             s[(CCHMAXPATH * 2) - 1] = 0;
-            stripcr(s);
-            lstrip(rstrip(s));
+            bstripcr(s);
             if(*fname == '\"') {
               memmove(fname,fname + 1,strlen(fname) + 1);
@@ -491 +491 @@
               break;
             lonename[CCHMAXPATH + 1] = 0;
-            stripcr(lonename);
-            lstrip(rstrip(lonename));
+            bstripcr(lonename);
             fname = lonename;
           }
@@ -1274 +1273 @@
         /* set unique id */
         WinSetWindowUShort(hwnd,QWS_ID,ARCOBJ_FRAME + (ARC_FRAME - dcd->id));
-        dcd->hwndObject = hwnd;
+        dcd->hwndObject = hwnd;         // pass back hwnd
         if(ParentIsDesktop(hwnd,dcd->hwndParent))
-          DosSleep(250L);
+          DosSleep(250L);               // Avoid race?
       }
       else
@@ -2453 +2452 @@
                             CCHMAXPATH,
                             s);
-        lstrip(rstrip(s));
+        bstrip(s);
         MakeFullName(s);
         if(*s) {