Changeset 1692

Timestamp:

Aug 11, 2013, 7:11:59 PM (12 years ago)

Author:

Gregg Young

Message:

Fix failure to create directory from archive file name when the name had a space. Strip extra leading " in extract and remove it from the arc container since it wasn't selectable and doesn't really make sense in that context (at least to me) Ticket 495

Location:

trunk/dll

Files:

• arccnrs.c (modified) (2 diffs)
• extract.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -2962 +2962 @@
         if (dcd->directory && fFileNameCnrPath &&
             stricmp(lastextractpath, dcd->directory)) {
-          strcpy(lastextractpath, dcd->directory);
+          strcpy(lastextractpath, dcd->directory);
+          //DbgMsg(pszSrcFile, __LINE__, "Extract dir %s", dcd->directory);
           SetDir(dcd->hwndParent, hwnd, dcd->directory, 1);
         }
@@ -3676 +3677 @@
           else
             strcpy(dcd->directory, extractpath);
-        }
-        if (!*dcd->directory && fFileNameCnrPath && dcd->arcname) {
+        }
+        // Removed because it can't be set from inside the container and names with a space
+        // break it. I don't think it makes sense from the container any way GKY 8-10-13
+        /*if (!*dcd->directory && fFileNameCnrPath && dcd->arcname) {
           strcpy(fullname, dcd->arcname);
           p = strrchr(fullname, '.');
-          if (p)
-           *p = 0;
+          if (p) {
+            *p = 0;
+          }
           else {
             p = fullname + strlen(fullname);
-            p--;
-            *p = 0;
+            p--;
+            *p = 0;
           }
           strcpy(dcd->directory, fullname);
-        }
+        } */
         if (!*dcd->directory && *lastextractpath) {
           //DosEnterCritSec();  //GKY 11-29-08

trunk/dll/extract.c

@@ -153 +153 @@
         strcpy(FileName, arcdata->arcname);
         p = strrchr(FileName, '.');
-        if (p)
+        if (p) {
           *p = 0;
+          if (strchr(FileName, '\"'))
+            memmove(FileName, FileName + 1, strlen(FileName) + 1);
+        }
         else {
           p = FileName + strlen(arcdata->arcname);
           p--;
           *p = 0;
+          if (strchr(FileName, '\"'))
+            memmove(FileName , FileName + 1, strlen(FileName) + 1);
         }
         strcpy(arcdata->extractdir, FileName);
@@ -296 +301 @@
           strcpy(FileName, arcdata->arcname);
           p = strrchr(FileName, '.');
-          if (p)
-           *p = 0;
+          if (p) {
+            *p = 0;
+            if (strchr(FileName, '\"'))
+            memmove(FileName, FileName + 1, strlen(FileName) + 1);
+          }
           else {
             p = FileName + strlen(arcdata->arcname);
             p--;
             *p = 0;
+            if (strchr(FileName, '\"'))
+            memmove(FileName, FileName + 1, strlen(FileName) + 1);
           }
           strcpy(arcdata->extractdir, FileName);