Changeset 1646 for trunk

Timestamp:

Nov 13, 2011, 6:13:03 AM (14 years ago)

Author:

Gregg Young

Message:

Fix popup file menu extract failure on arc file with spaces in its name. Ticket 481

File:

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

trunk/dll/worker.c

@@ -48 +48 @@
   20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused
                 by temp file creation failures.
+  12 Nov 11 GKY Fixed extract failure caused by spaces in the arc file name.
 
 ***********************************************************************/
@@ -476 +477 @@
                 {
                   EXTRDATA ex;
-                  BOOL maskspaces = FALSE;
+                  BOOL maskspaces = FALSE;
+                  CHAR arcname[CCHMAXPATH];
 
                   memset(&ex, 0, sizeof(EXTRDATA));
@@ -482 +484 @@
                   if (!ex.info || (!ex.info->extract && !ex.info->exwdirs))
                     break;
-                  ex.size = sizeof(EXTRDATA);
-                  ex.arcname = wk->li->list[x];
-                  strcpy(ex.masks, "*");
+                  ex.size = sizeof(EXTRDATA);
+                  BldQuotedFileName(arcname, wk->li->list[x]);
+                  ex.arcname = arcname;
+                  if (!*ex.masks)
+                    strcpy(ex.masks, "*");
                   strcpy(ex.extractdir, wk->li->targetpath);
                   if (!WinDlgBox(HWND_DESKTOP,