Changeset 1104


Ignore:
Timestamp:
Aug 2, 2008, 10:33:03 PM (17 years ago)
Author:
Gregg Young
Message:

Replace save_dir2(dir) with strcpy(dir, pFM2SaveDirectory)

Location:
trunk/dll
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/arccnrs.c

    r1082 r1104  
    5656  16 Jul 08 GKY Fix trap on viewing multiple files from an archive (misplaced free)
    5757  16 Jul 08 GKY Use TMP directory for temp files if present. Use MakeTempName
     58  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
    5859
    5960***********************************************************************/
    … …  
    35413542        dcd->type = ARC_FRAME;
    35423543        if (!pTmpDir)
    3543           save_dir2(dcd->workdir);
     3544          strcpy(dcd->workdir, pFM2SaveDirectory);
    35443545        MakeTempName(dcd->workdir, ArcTempRoot, 2);
    35453546          /*if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
    … …  
    35893590             (driveflags[toupper(*dcd->directory) - 'A'] &
    35903591              DRIVE_NOTWRITEABLE)))
    3591           save_dir2(dcd->directory);
     3592          strcpy(dcd->directory, pFM2SaveDirectory);
    35923593        dcd->hwndParent = hwndParent ? hwndParent : HWND_DESKTOP;
    35933594        dcd->hwndFrame = hwndFrame;

  • trunk/dll/assoc.c

    r1082 r1104  
    144144  assloaded = TRUE;
    145145  BldFullPathName(mask, pFM2SaveDirectory, "ASSOC.DAT");
    146   /*save_dir2(mask);
    147   if (mask[strlen(mask) - 1] != '\\')
    148     strcat(mask, "\\");
    149   strcat(mask, "ASSOC.DAT");*/
    150146  fp = _fsopen(mask, "r", SH_DENYWR);
    151147  pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
    … …  
    269265  }
    270266#endif
    271   /*save_dir2(s);
    272   if (s[strlen(s) - 1] != '\\')
    273     strcat(s, "\\");
    274     strcat(s, "ASSOC.DAT");*/
    275267  BldFullPathName(s, pFM2SaveDirectory, "ASSOC.DAT");
    276268  fp = xfopen(s, "w", pszSrcFile, __LINE__);

  • trunk/dll/cmdline.c

    r1082 r1104  
    7676      MiniLoaded = TRUE;
    7777    BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
    78     /*save_dir2(pszCmdLine);
    79     if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
    80       strcat(pszCmdLine, "\\");
    81     strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");*/
    8278    fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
    8379    if (fp) {
    … …  
    133129    return;
    134130  BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
    135   /*save_dir2(pszCmdLine);
    136   if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
    137     strcat(pszCmdLine, "\\");
    138   strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");*/
    139131  if (CmdLineHead) {
    140132    fp = xfopen(pszCmdLine, "w", pszSrcFile, __LINE__);

  • trunk/dll/command.c

    r1082 r1104  
    333333  if (pszCmdLine) {
    334334    BldFullPathName(pszCmdLine, pFM2SaveDirectory, "COMMANDS.DAT");
    335     /*save_dir2(pszCmdLine);
    336     if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
    337       strcat(pszCmdLine, "\\");
    338     strcat(pszCmdLine, "COMMANDS.DAT");*/
    339335    fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
    340336    if (fp) {
    … …  
    402398  info = cmdhead;
    403399  BldFullPathName(s, pFM2SaveDirectory, "COMMANDS.DAT");
    404   /*save_dir2(s);
    405   if (s[strlen(s) - 1] != '\\')
    406     strcat(s, "\\");
    407   strcat(s, "COMMANDS.DAT");*/
    408400  fp = xfopen(s, "w", pszSrcFile, __LINE__);
    409401  if (fp) {

  • trunk/dll/dirsize.c

    r1082 r1104  
    932932        else
    933933          strcpy(szFileName, pFM2SaveDirectory);
    934         //save_dir2(szFileName);
    935934        sprintf(&szFileName[strlen(szFileName)], "\\%csizes.Rpt",
    936935                (pState) ? toupper(*pState->szDirName) : '+');

  • trunk/dll/extract.c

    r907 r1104  
    1414  19 Apr 07 SHL Sync with AcceptOneDrop GetOneDrop mods
    1515  20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
     16  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
    1617
    1718***********************************************************************/
    … …  
    175176        }
    176177        if (!*arcdata->extractdir)
    177           save_dir2(arcdata->extractdir);
     178          strcpy(arcdata->extractdir, pFM2SaveDirectory);
    178179      }
    179180      WinSetDlgItemText(hwnd, EXT_DIRECTORY, arcdata->extractdir);

  • trunk/dll/filldir.c

    r1099 r1104  
    4545  20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
    4646  21 Jul 08 JBS Ticket 114: Change env var separator from blank to semicolon
     47  02 Aug 08 GKY Remove redundant strcpys from inner loop
    4748
    4849***********************************************************************/

  • trunk/dll/filter.c

    r1082 r1104  
    136136  loadedmasks = TRUE;
    137137  BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT");
    138   /*save_dir2(s);
    139   if (s[strlen(s) - 1] != '\\')
    140     strcat(s, "\\");
    141   strcat(s, "FILTERS.DAT");*/
    142138  fp = _fsopen(s, "r", SH_DENYWR);
    143139  if (fp) {
    … …  
    179175  if (maskhead) {
    180176    BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT");
    181     /*save_dir2(s);
    182     if (s[strlen(s) - 1] != '\\')
    183       strcat(s, "\\");
    184     strcat(s, "FILTERS.DAT");*/
    185177    fp = xfopen(s, "w", pszSrcFile, __LINE__);
    186178    if (fp) {

  • trunk/dll/grep2.c

    r1082 r1104  
    271271
    272272    BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
    273     /*save_dir2(s);
    274     if (s[strlen(s) - 1] != '\\')
    275       strcat(s, "\\");
    276     strcat(s, "GREPMASK.DAT");*/
    277273    fp = _fsopen(s, "r", SH_DENYWR);
    278274    if (fp) {
    … …  
    952948        if (sSelect > 0) {
    953949          BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
    954           /*save_dir2(s);
    955           if (s[strlen(s) - 1] != '\\')
    956             strcat(s, "\\");
    957           strcat(s, "GREPMASK.DAT");*/
    958950          fp = xfopen(s, "w", pszSrcFile, __LINE__);
    959951          if (fp) {

  • trunk/dll/inis.c

    r1082 r1104  
    11381138        *tempsysini = 0;
    11391139        BldFullPathName(tempuserini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPUSER.INI");
    1140         /*save_dir2(tempuserini);
    1141         if (tempuserini[strlen(tempuserini) - 1] != '\\')
    1142           strcat(tempuserini, "\\");
    1143         strcat(tempuserini, "TEMPUSER.INI");*/
    11441140        rc = DosCopy(userini, tempuserini, DCPY_EXISTING);
    11451141        if (rc) {
    … …  
    11531149        }
    11541150        BldFullPathName(tempsysini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPSYS.INI");
    1155         /*save_dir2(tempsysini);
    1156         if (tempsysini[strlen(tempsysini) - 1] != '\\')
    1157           strcat(tempsysini, "\\");
    1158         strcat(tempsysini, "TEMPSYS.INI");*/
    11591151        rc = DosCopy(sysini, tempsysini, DCPY_EXISTING);
    11601152        if (rc) {

  • trunk/dll/init.c

    r1089 r1104  
    521521    strcpy(s, pTmpDir);
    522522  else
    523     save_dir2(s);
     523    strcpy(s, pFM2SaveDirectory);
    524524  if (s[strlen(s) - 1] != '\\')
    525525    strcat(s, "\\");
    … …  
    756756
    757757    DosError(FERR_DISABLEHARDERR);
    758     save_dir2(HomePath);
     758    strcpy(HomePath, pFM2SaveDirectory);
    759759    DosError(FERR_DISABLEHARDERR);
    760760    memset(driveserial, -1, sizeof(driveserial));

  • trunk/dll/loadbmp.c

    r1082 r1104  
    3838  char s[CCHMAXPATH];
    3939
    40   //save_dir2(s);
    4140  strcpy(s, pFM2SaveDirectory);
    4241  sprintf(s + strlen(s), "\\%u.BMP", id);

  • trunk/dll/mainwnd.c

    r1077 r1104  
    6464  12 Jul 08 JBS Ticket 246: Allow saved directory container states to have no directory containers
    6565                (i.e. just a directory tree container).
    66   18 Jul 08 SHL Use new Fortify feature to avoid spurious reports
     66                18 Jul 08 SHL Use new Fortify feature to avoid spurious reports
     67  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
    6768
    6869***********************************************************************/
    … …  
    356357      }
    357358      else
    358         save_dir2(ret);
     359        strcpy(ret, pFM2SaveDirectory);
    359360    }
    360361  }
    … …  
    45484549      }
    45494550      else
    4550         save_dir2(wa.szCurrentPath1);
     4551        strcpy(wa.szCurrentPath1, pFM2SaveDirectory);
    45514552      TopWindowName(hwndMain, (HWND) 0, wa.szCurrentPath2);
    45524553      if (!*wa.szCurrentPath2)
    … …  
    50245025      }
    50255026      else
    5026         save_dir2(path);
     5027        strcpy(path, pFM2SaveDirectory);
    50275028      WinDlgBox(HWND_DESKTOP, hwnd, InstantDlgProc, FM3ModHandle,
    50285029                BAT_FRAME, MPFROMP(path));
    … …  
    62336234                    !WinSendMsg(WinQueryWindow(LastDir, QW_PARENT),
    62346235                                UM_CONTAINERDIR, MPFROMP(path), MPVOID))
    6235                   save_dir2(path);
     6236                  strcpy(path, pFM2SaveDirectory);
    62366237                if (!PMMkDir(hwnd, path, TRUE)) {
    62376238                  WinSetWindowText(hwndUL, GetPString(IDS_COMMONDIRTEXT));

  • trunk/dll/mkdir.c

    r985 r1104  
    1111  01 Aug 04 SHL Baseline
    1212  29 Feb 08 GKY Refactor global command line variables to notebook.h
     13  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
    1314
    1415***********************************************************************/
    … …  
    154155    strcpy(szBuff, filename);
    155156  else
    156     save_dir2(szBuff);
     157    strcpy(szBuff, pFM2SaveDirectory);
    157158  MakeValidDir(szBuff);
    158159  if (*szBuff && szBuff[strlen(szBuff) - 1] != '\\')

  • trunk/dll/remap.c

    r1082 r1104  
    7474  loadedres = TRUE;
    7575  BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT");
    76   /*save_dir2(s);
    77   if (s[strlen(s) - 1] != '\\')
    78     strcat(s, "\\");
    79   strcat(s, "RESOURCE.DAT");*/
    8076  fp = _fsopen(s, "r", SH_DENYWR);
    8177  if (fp) {
    … …  
    116112    return;
    117113  BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT");
    118   /*save_dir2(s);
    119   if (s[strlen(s) - 1] != '\\')
    120     strcat(s, "\\");
    121   strcat(s, "RESOURCE.DAT");*/
    122114  if (reshead) {
    123115    fp = xfopen(s, "w", pszSrcFile, __LINE__);

  • trunk/dll/saveclip.c

    r1084 r1104  
    255255
    256256        BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT");
    257         /*save_dir2(s);
    258         if (s[strlen(s) - 1] != '\\')
    259           strcat(s, "\\");
    260         strcat(s, "PATTERNS.DAT");*/
    261257        fp = _fsopen(s, "r", SH_DENYWR);
    262258        if (fp) {
    … …  
    286282      if (sMax > 0) {
    287283        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
    288         /*save_dir2(szBuffer);
    289         if (szBuffer[strlen(szBuffer) - 1] != '\\')
    290           strcat(szBuffer, "\\");
    291         strcat(szBuffer, "PATTERNS.DAT");*/
    292284        fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);
    293285        if (fp) {
    … …  
    307299      else if (!sMax) {
    308300        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
    309         /*save_dir2(szBuffer);
    310         if (szBuffer[strlen(szBuffer) - 1] != '\\')
    311           strcat(szBuffer, "\\");
    312         strcat(szBuffer, "PATTERNS.DAT");*/
    313301        unlinkf("%s", szBuffer);
    314302      }
    … …  
    619607
    620608        BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT");
    621         /*save_dir2(s);
    622         if (s[strlen(s) - 1] != '\\')
    623           strcat(s, "\\");
    624         strcat(s, "PATTERNS.DAT");*/
    625609        fp = _fsopen(s, "r", SH_DENYWR);
    626610        if (fp) {
    … …  
    651635      if (sMax > 0) {
    652636        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
    653         /*save_dir2(szBuffer);
    654         if (szBuffer[strlen(szBuffer) - 1] != '\\')
    655           strcat(szBuffer, "\\");
    656         strcat(szBuffer, "PATTERNS.DAT");*/
    657637        fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);
    658638        if (fp) {
    … …  
    672652      else if (!sMax) {
    673653        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
    674         /*save_dir2(szBuffer);
    675         if (szBuffer[strlen(szBuffer) - 1] != '\\')
    676           strcat(szBuffer, "\\");
    677         strcat(szBuffer, "PATTERNS.DAT");*/
    678654        unlinkf("%s", szBuffer);
    679655      }

  • trunk/dll/systemf.c

    r1082 r1104  
    287287          char temp[CCHMAXPATH];
    288288
    289           save_dir2(temp);
     289          strcpy(temp, pFM2SaveDirectory);
    290290          if (needs_quoting(temp) && !strchr(temp, '\"')) {
    291291            spaces = TRUE;
    … …  
    339339          char temp[CCHMAXPATH];
    340340
    341           save_dir2(temp);
     341          strcpy(temp, pFM2SaveDirectory);
    342342          if (needs_quoting(temp) && !strchr(temp, '\"')) {
    343343            spaces = TRUE;
    … …  
    801801            *pszDirectory)
    802802        {
    803           save_dir2(szSavedir);
     803          strcpy(szSavedir, pFM2SaveDirectory);
    804804          switch_to(pszDirectory);
    805805        }
    … …  
    847847        memset(&results, 0, sizeof(results));
    848848        if (pszDirectory && *pszDirectory) {
    849           save_dir2(szSavedir);
     849          strcpy(szSavedir, pFM2SaveDirectory);
    850850          switch_to(pszDirectory);
    851851        }
    … …  
    938938          *pszDirectory)
    939939      {
    940         save_dir2(szSavedir);
     940        strcpy(szSavedir, pFM2SaveDirectory);
    941941        switch_to(pszDirectory);
    942942      }
    … …  
    11041104
    11051105      if (pszDirectory && *pszDirectory) {
    1106         save_dir2(szSavedir);
     1106        strcpy(szSavedir, pFM2SaveDirectory);
    11071107        switch_to(pszDirectory);
    11081108      }

  • trunk/dll/tools.c

    r1082 r1104  
    6363  }
    6464  BldFullPathName(s, pFM2SaveDirectory, "QUICKTLS.DAT");
    65   /*save_dir2(s);
    66   if (s[strlen(s) - 1] != '\\')
    67     strcat(s, "\\");
    68   strcat(s, "QUICKTLS.DAT");*/
    6965  fp = _fsopen(s, "r", SH_DENYWR);
    7066  if (fp) {
    … …  
    9793    return;
    9894  BldFullPathName(s, pFM2SaveDirectory, "QUICKTLS.DAT");
    99   /*save_dir2(s);
    100   if (s[strlen(s) - 1] != '\\')
    101     strcat(s, "\\");
    102   strcat(s, "QUICKTLS.DAT");*/
    10395  fp = xfopen(s, "w", pszSrcFile, __LINE__);
    10496  if (fp) {

  • trunk/dll/valid.c

    r946 r1104  
    2626  30 Dec 07 GKY Change TestDates to TestFDates can compare by filename or FDATE/FTIME data
    2727  30 Dec 07 GKY Add TestCDates to compare CNRITEMs by CDATE/CTIME data
     28  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
    2829
    2930***********************************************************************/
    … …  
    547548  }
    548549  else
    549     save_dir2(path);                    // Fall back to fm3.ini drive or current dir - should never occur
     550    strcpy(path, pFM2SaveDirectory);                    // Fall back to fm3.ini drive or current dir - should never occur
    550551  return path;
    551552}

  • trunk/dll/viewinf.c

    r1082 r1104  
    544544          }
    545545          BldFullPathName(filename, pFM2SaveDirectory, "FM2VINF.CMD");
    546           /*save_dir2(filename);
    547           if (filename[strlen(filename) - 1] != '\\')
    548             strcat(filename, "\\");
    549           strcat(filename, "FM2VINF.CMD");*/
    550546          fp = xfopen(filename, "w", pszSrcFile, __LINE__);
    551547          if (fp) {

  • trunk/dll/walkem.c

    r1082 r1104  
    357357  fUdirsChanged = FALSE;
    358358  BldFullPathName(s, pFM2SaveDirectory, "USERDIRS.DAT");
    359   /*save_dir2(s);
    360   if (s[strlen(s) - 1] != '\\')
    361     strcat(s, "\\");
    362   strcat(s, "USERDIRS.DAT");*/
    363359  fp = _fsopen(s, "r", SH_DENYWR);
    364360  if (fp) {
    … …  
    407403    if (udirhead) {
    408404      BldFullPathName(s, pFM2SaveDirectory, "USERDIRS.DAT");
    409       /*save_dir2(s);
    410       if (s[strlen(s) - 1] != '\\')
    411         strcat(s, "\\");
    412       strcat(s, "USERDIRS.DAT");*/
    413405      fp = xfopen(s, "w", pszSrcFile, __LINE__);
    414406      if (fp) {
    … …  
    773765      wa->nounwriteable = TRUE;
    774766    if (!*wa->szReturnPath)
    775       save_dir2(wa->szCurrentPath);
     767      strcpy(wa->szCurrentPath, pFM2SaveDirectory);
    776768    else {
    777769      strcpy(wa->szCurrentPath, wa->szReturnPath);
    … …  
    13971389    }
    13981390    if (!*wa->szCurrentPath1)
    1399       save_dir2(wa->szCurrentPath1);
     1391      strcpy(wa->szCurrentPath1, pFM2SaveDirectory);
    14001392    MakeFullName(wa->szCurrentPath1);
    14011393    if (!*wa->szCurrentPath2)
    1402       save_dir2(wa->szCurrentPath2);
     1394      strcpy(wa->szCurrentPath2, pFM2SaveDirectory);
    14031395    MakeFullName(wa->szCurrentPath2);
    14041396    WinSendDlgItemMsg(hwnd,
Note: See TracChangeset for help on using the changeset viewer.