Changeset 1798


Ignore:
Timestamp:
Mar 16, 2015, 10:19:55 PM (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/extract.c

    r1791 r1798  
    2525  31 Aug 14 GKY Fix failure to remove leading quote on toogle of extract directory to and
    2626                from using file name.
     27  16 Mar 15 GKY Fixed case where leading quote fix would remove the drive letter.
    2728
    2829***********************************************************************/
     
    167168          p--;
    168169          *p = 0;
    169           if (strchr(FileName, '\"') == strrchr(FileName, '\"'))
     170          if (strchr(FileName, '\"') && strchr(FileName, '\"') == strrchr(FileName, '\"'))
    170171            memmove(FileName , FileName + 1, strlen(FileName) + 1);
    171172        }
     
    315316            p--;
    316317            *p = 0;
    317             if (strchr(FileName, '\"') == strrchr(FileName, '\"'))
     318            if (strchr(FileName, '\"') && strchr(FileName, '\"') == strrchr(FileName, '\"'))
    318319              memmove(FileName, FileName + 1, strlen(FileName) + 1);
    319320          }
     
    356357              strcpy(arcdata->extractdir, pFM2SaveDirectory);
    357358          }
    358           if (strchr(arcdata->extractdir, '\"') == strrchr(arcdata->extractdir, '\"'))
     359          if (strchr(arcdata->extractdir, '\"') && strchr(arcdata->extractdir, '\"') == strrchr(arcdata->extractdir, '\"'))
    359360            memmove(arcdata->extractdir, arcdata->extractdir + 1,
    360361                    strlen(arcdata->extractdir) + 1);
Note: See TracChangeset for help on using the changeset viewer.