Changeset 1791 for trunk/dll/extract.c

Timestamp:

Aug 31, 2014, 8:13:17 PM (11 years ago)

Author:

Gregg Young

Message:

Fix failure to remove leading quote on toogle of extract directory to and from using file name. Ticket [495]

File:

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

trunk/dll/extract.c

@@ -23 +23 @@
                 if the name needed quoting.
   15 Feb 14 GKY Assure the title is blank on the execute dialog call with the "see" button
+  31 Aug 14 GKY Fix failure to remove leading quote on toogle of extract directory to and
+                from using file name.
 
 ***********************************************************************/
@@ -165 +167 @@
           p--;
           *p = 0;
-          if (strchr(FileName, '\"'))
+          if (strchr(FileName, '\"') == strrchr(FileName, '\"'))
             memmove(FileName , FileName + 1, strlen(FileName) + 1);
         }
@@ -307 +309 @@
             *p = 0;
             if (strchr(FileName, '\"'))
-            memmove(FileName, FileName + 1, strlen(FileName) + 1);
+              memmove(FileName, FileName + 1, strlen(FileName) + 1);
           }
           else {
@@ -313 +315 @@
             p--;
             *p = 0;
-            if (strchr(FileName, '\"'))
-            memmove(FileName, FileName + 1, strlen(FileName) + 1);
+            if (strchr(FileName, '\"') == strrchr(FileName, '\"'))
+              memmove(FileName, FileName + 1, strlen(FileName) + 1);
           }
           strcpy(arcdata->extractdir, FileName);
@@ -354 +356 @@
               strcpy(arcdata->extractdir, pFM2SaveDirectory);
           }
+          if (strchr(arcdata->extractdir, '\"') == strrchr(arcdata->extractdir, '\"'))
+            memmove(arcdata->extractdir, arcdata->extractdir + 1,
+                    strlen(arcdata->extractdir) + 1);
           WinSetDlgItemText(hwnd, EXT_DIRECTORY, arcdata->extractdir);
         }