Changeset 1798 for trunk/dll/extract.c

Timestamp:

Mar 16, 2015, 11:19:55 PM (10 years ago)

Author:

Gregg Young

Message:

Fix case where fix to remove a leading quote from the extract path would remove the drive letter. Ticket [495]

File:

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

trunk/dll/extract.c

@@ -25 +25 @@
   31 Aug 14 GKY Fix failure to remove leading quote on toogle of extract directory to and
                 from using file name.
+  16 Mar 15 GKY Fixed case where leading quote fix would remove the drive letter.
 
 ***********************************************************************/
@@ -167 +168 @@
           p--;
           *p = 0;
-          if (strchr(FileName, '\"') == strrchr(FileName, '\"'))
+          if (strchr(FileName, '\"') && strchr(FileName, '\"') == strrchr(FileName, '\"'))
             memmove(FileName , FileName + 1, strlen(FileName) + 1);
         }
@@ -315 +316 @@
             p--;
             *p = 0;
-            if (strchr(FileName, '\"') == strrchr(FileName, '\"'))
+            if (strchr(FileName, '\"') && strchr(FileName, '\"') == strrchr(FileName, '\"'))
               memmove(FileName, FileName + 1, strlen(FileName) + 1);
           }
@@ -356 +357 @@
               strcpy(arcdata->extractdir, pFM2SaveDirectory);
           }
-          if (strchr(arcdata->extractdir, '\"') == strrchr(arcdata->extractdir, '\"'))
+          if (strchr(arcdata->extractdir, '\"') && strchr(arcdata->extractdir, '\"') == strrchr(arcdata->extractdir, '\"'))
             memmove(arcdata->extractdir, arcdata->extractdir + 1,
                     strlen(arcdata->extractdir) + 1);