Changeset 1692 for trunk/dll/extract.c

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

File:

• trunk/dll/extract.c (modified) (2 diffs)

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);