Changeset 1104
- Timestamp:
- Aug 2, 2008, 10:33:03 PM (17 years ago)
- Location:
- trunk/dll
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/arccnrs.c
r1082 r1104 56 56 16 Jul 08 GKY Fix trap on viewing multiple files from an archive (misplaced free) 57 57 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 58 59 59 60 ***********************************************************************/ … … 3541 3542 dcd->type = ARC_FRAME; 3542 3543 if (!pTmpDir) 3543 s ave_dir2(dcd->workdir);3544 strcpy(dcd->workdir, pFM2SaveDirectory); 3544 3545 MakeTempName(dcd->workdir, ArcTempRoot, 2); 3545 3546 /*if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\') … … 3589 3590 (driveflags[toupper(*dcd->directory) - 'A'] & 3590 3591 DRIVE_NOTWRITEABLE))) 3591 s ave_dir2(dcd->directory);3592 strcpy(dcd->directory, pFM2SaveDirectory); 3592 3593 dcd->hwndParent = hwndParent ? hwndParent : HWND_DESKTOP; 3593 3594 dcd->hwndFrame = hwndFrame; -
trunk/dll/assoc.c
r1082 r1104 144 144 assloaded = TRUE; 145 145 BldFullPathName(mask, pFM2SaveDirectory, "ASSOC.DAT"); 146 /*save_dir2(mask);147 if (mask[strlen(mask) - 1] != '\\')148 strcat(mask, "\\");149 strcat(mask, "ASSOC.DAT");*/150 146 fp = _fsopen(mask, "r", SH_DENYWR); 151 147 pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__); … … 269 265 } 270 266 #endif 271 /*save_dir2(s);272 if (s[strlen(s) - 1] != '\\')273 strcat(s, "\\");274 strcat(s, "ASSOC.DAT");*/275 267 BldFullPathName(s, pFM2SaveDirectory, "ASSOC.DAT"); 276 268 fp = xfopen(s, "w", pszSrcFile, __LINE__); -
trunk/dll/cmdline.c
r1082 r1104 76 76 MiniLoaded = TRUE; 77 77 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");*/82 78 fp = _fsopen(pszCmdLine, "r", SH_DENYWR); 83 79 if (fp) { … … 133 129 return; 134 130 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");*/139 131 if (CmdLineHead) { 140 132 fp = xfopen(pszCmdLine, "w", pszSrcFile, __LINE__); -
trunk/dll/command.c
r1082 r1104 333 333 if (pszCmdLine) { 334 334 BldFullPathName(pszCmdLine, pFM2SaveDirectory, "COMMANDS.DAT"); 335 /*save_dir2(pszCmdLine);336 if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')337 strcat(pszCmdLine, "\\");338 strcat(pszCmdLine, "COMMANDS.DAT");*/339 335 fp = _fsopen(pszCmdLine, "r", SH_DENYWR); 340 336 if (fp) { … … 402 398 info = cmdhead; 403 399 BldFullPathName(s, pFM2SaveDirectory, "COMMANDS.DAT"); 404 /*save_dir2(s);405 if (s[strlen(s) - 1] != '\\')406 strcat(s, "\\");407 strcat(s, "COMMANDS.DAT");*/408 400 fp = xfopen(s, "w", pszSrcFile, __LINE__); 409 401 if (fp) { -
trunk/dll/dirsize.c
r1082 r1104 932 932 else 933 933 strcpy(szFileName, pFM2SaveDirectory); 934 //save_dir2(szFileName);935 934 sprintf(&szFileName[strlen(szFileName)], "\\%csizes.Rpt", 936 935 (pState) ? toupper(*pState->szDirName) : '+'); -
trunk/dll/extract.c
r907 r1104 14 14 19 Apr 07 SHL Sync with AcceptOneDrop GetOneDrop mods 15 15 20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat 16 19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory 16 17 17 18 ***********************************************************************/ … … 175 176 } 176 177 if (!*arcdata->extractdir) 177 s ave_dir2(arcdata->extractdir);178 strcpy(arcdata->extractdir, pFM2SaveDirectory); 178 179 } 179 180 WinSetDlgItemText(hwnd, EXT_DIRECTORY, arcdata->extractdir); -
trunk/dll/filldir.c
r1099 r1104 45 45 20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container. 46 46 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 47 48 48 49 ***********************************************************************/ -
trunk/dll/filter.c
r1082 r1104 136 136 loadedmasks = TRUE; 137 137 BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT"); 138 /*save_dir2(s);139 if (s[strlen(s) - 1] != '\\')140 strcat(s, "\\");141 strcat(s, "FILTERS.DAT");*/142 138 fp = _fsopen(s, "r", SH_DENYWR); 143 139 if (fp) { … … 179 175 if (maskhead) { 180 176 BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT"); 181 /*save_dir2(s);182 if (s[strlen(s) - 1] != '\\')183 strcat(s, "\\");184 strcat(s, "FILTERS.DAT");*/185 177 fp = xfopen(s, "w", pszSrcFile, __LINE__); 186 178 if (fp) { -
trunk/dll/grep2.c
r1082 r1104 271 271 272 272 BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT"); 273 /*save_dir2(s);274 if (s[strlen(s) - 1] != '\\')275 strcat(s, "\\");276 strcat(s, "GREPMASK.DAT");*/277 273 fp = _fsopen(s, "r", SH_DENYWR); 278 274 if (fp) { … … 952 948 if (sSelect > 0) { 953 949 BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT"); 954 /*save_dir2(s);955 if (s[strlen(s) - 1] != '\\')956 strcat(s, "\\");957 strcat(s, "GREPMASK.DAT");*/958 950 fp = xfopen(s, "w", pszSrcFile, __LINE__); 959 951 if (fp) { -
trunk/dll/inis.c
r1082 r1104 1138 1138 *tempsysini = 0; 1139 1139 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");*/1144 1140 rc = DosCopy(userini, tempuserini, DCPY_EXISTING); 1145 1141 if (rc) { … … 1153 1149 } 1154 1150 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");*/1159 1151 rc = DosCopy(sysini, tempsysini, DCPY_EXISTING); 1160 1152 if (rc) { -
trunk/dll/init.c
r1089 r1104 521 521 strcpy(s, pTmpDir); 522 522 else 523 s ave_dir2(s);523 strcpy(s, pFM2SaveDirectory); 524 524 if (s[strlen(s) - 1] != '\\') 525 525 strcat(s, "\\"); … … 756 756 757 757 DosError(FERR_DISABLEHARDERR); 758 s ave_dir2(HomePath);758 strcpy(HomePath, pFM2SaveDirectory); 759 759 DosError(FERR_DISABLEHARDERR); 760 760 memset(driveserial, -1, sizeof(driveserial)); -
trunk/dll/loadbmp.c
r1082 r1104 38 38 char s[CCHMAXPATH]; 39 39 40 //save_dir2(s);41 40 strcpy(s, pFM2SaveDirectory); 42 41 sprintf(s + strlen(s), "\\%u.BMP", id); -
trunk/dll/mainwnd.c
r1077 r1104 64 64 12 Jul 08 JBS Ticket 246: Allow saved directory container states to have no directory containers 65 65 (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 67 68 68 69 ***********************************************************************/ … … 356 357 } 357 358 else 358 s ave_dir2(ret);359 strcpy(ret, pFM2SaveDirectory); 359 360 } 360 361 } … … 4548 4549 } 4549 4550 else 4550 s ave_dir2(wa.szCurrentPath1);4551 strcpy(wa.szCurrentPath1, pFM2SaveDirectory); 4551 4552 TopWindowName(hwndMain, (HWND) 0, wa.szCurrentPath2); 4552 4553 if (!*wa.szCurrentPath2) … … 5024 5025 } 5025 5026 else 5026 s ave_dir2(path);5027 strcpy(path, pFM2SaveDirectory); 5027 5028 WinDlgBox(HWND_DESKTOP, hwnd, InstantDlgProc, FM3ModHandle, 5028 5029 BAT_FRAME, MPFROMP(path)); … … 6233 6234 !WinSendMsg(WinQueryWindow(LastDir, QW_PARENT), 6234 6235 UM_CONTAINERDIR, MPFROMP(path), MPVOID)) 6235 s ave_dir2(path);6236 strcpy(path, pFM2SaveDirectory); 6236 6237 if (!PMMkDir(hwnd, path, TRUE)) { 6237 6238 WinSetWindowText(hwndUL, GetPString(IDS_COMMONDIRTEXT)); -
trunk/dll/mkdir.c
r985 r1104 11 11 01 Aug 04 SHL Baseline 12 12 29 Feb 08 GKY Refactor global command line variables to notebook.h 13 19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory 13 14 14 15 ***********************************************************************/ … … 154 155 strcpy(szBuff, filename); 155 156 else 156 s ave_dir2(szBuff);157 strcpy(szBuff, pFM2SaveDirectory); 157 158 MakeValidDir(szBuff); 158 159 if (*szBuff && szBuff[strlen(szBuff) - 1] != '\\') -
trunk/dll/remap.c
r1082 r1104 74 74 loadedres = TRUE; 75 75 BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT"); 76 /*save_dir2(s);77 if (s[strlen(s) - 1] != '\\')78 strcat(s, "\\");79 strcat(s, "RESOURCE.DAT");*/80 76 fp = _fsopen(s, "r", SH_DENYWR); 81 77 if (fp) { … … 116 112 return; 117 113 BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT"); 118 /*save_dir2(s);119 if (s[strlen(s) - 1] != '\\')120 strcat(s, "\\");121 strcat(s, "RESOURCE.DAT");*/122 114 if (reshead) { 123 115 fp = xfopen(s, "w", pszSrcFile, __LINE__); -
trunk/dll/saveclip.c
r1084 r1104 255 255 256 256 BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT"); 257 /*save_dir2(s);258 if (s[strlen(s) - 1] != '\\')259 strcat(s, "\\");260 strcat(s, "PATTERNS.DAT");*/261 257 fp = _fsopen(s, "r", SH_DENYWR); 262 258 if (fp) { … … 286 282 if (sMax > 0) { 287 283 BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT"); 288 /*save_dir2(szBuffer);289 if (szBuffer[strlen(szBuffer) - 1] != '\\')290 strcat(szBuffer, "\\");291 strcat(szBuffer, "PATTERNS.DAT");*/292 284 fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__); 293 285 if (fp) { … … 307 299 else if (!sMax) { 308 300 BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT"); 309 /*save_dir2(szBuffer);310 if (szBuffer[strlen(szBuffer) - 1] != '\\')311 strcat(szBuffer, "\\");312 strcat(szBuffer, "PATTERNS.DAT");*/313 301 unlinkf("%s", szBuffer); 314 302 } … … 619 607 620 608 BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT"); 621 /*save_dir2(s);622 if (s[strlen(s) - 1] != '\\')623 strcat(s, "\\");624 strcat(s, "PATTERNS.DAT");*/625 609 fp = _fsopen(s, "r", SH_DENYWR); 626 610 if (fp) { … … 651 635 if (sMax > 0) { 652 636 BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT"); 653 /*save_dir2(szBuffer);654 if (szBuffer[strlen(szBuffer) - 1] != '\\')655 strcat(szBuffer, "\\");656 strcat(szBuffer, "PATTERNS.DAT");*/657 637 fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__); 658 638 if (fp) { … … 672 652 else if (!sMax) { 673 653 BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT"); 674 /*save_dir2(szBuffer);675 if (szBuffer[strlen(szBuffer) - 1] != '\\')676 strcat(szBuffer, "\\");677 strcat(szBuffer, "PATTERNS.DAT");*/678 654 unlinkf("%s", szBuffer); 679 655 } -
trunk/dll/systemf.c
r1082 r1104 287 287 char temp[CCHMAXPATH]; 288 288 289 s ave_dir2(temp);289 strcpy(temp, pFM2SaveDirectory); 290 290 if (needs_quoting(temp) && !strchr(temp, '\"')) { 291 291 spaces = TRUE; … … 339 339 char temp[CCHMAXPATH]; 340 340 341 s ave_dir2(temp);341 strcpy(temp, pFM2SaveDirectory); 342 342 if (needs_quoting(temp) && !strchr(temp, '\"')) { 343 343 spaces = TRUE; … … 801 801 *pszDirectory) 802 802 { 803 s ave_dir2(szSavedir);803 strcpy(szSavedir, pFM2SaveDirectory); 804 804 switch_to(pszDirectory); 805 805 } … … 847 847 memset(&results, 0, sizeof(results)); 848 848 if (pszDirectory && *pszDirectory) { 849 s ave_dir2(szSavedir);849 strcpy(szSavedir, pFM2SaveDirectory); 850 850 switch_to(pszDirectory); 851 851 } … … 938 938 *pszDirectory) 939 939 { 940 s ave_dir2(szSavedir);940 strcpy(szSavedir, pFM2SaveDirectory); 941 941 switch_to(pszDirectory); 942 942 } … … 1104 1104 1105 1105 if (pszDirectory && *pszDirectory) { 1106 s ave_dir2(szSavedir);1106 strcpy(szSavedir, pFM2SaveDirectory); 1107 1107 switch_to(pszDirectory); 1108 1108 } -
trunk/dll/tools.c
r1082 r1104 63 63 } 64 64 BldFullPathName(s, pFM2SaveDirectory, "QUICKTLS.DAT"); 65 /*save_dir2(s);66 if (s[strlen(s) - 1] != '\\')67 strcat(s, "\\");68 strcat(s, "QUICKTLS.DAT");*/69 65 fp = _fsopen(s, "r", SH_DENYWR); 70 66 if (fp) { … … 97 93 return; 98 94 BldFullPathName(s, pFM2SaveDirectory, "QUICKTLS.DAT"); 99 /*save_dir2(s);100 if (s[strlen(s) - 1] != '\\')101 strcat(s, "\\");102 strcat(s, "QUICKTLS.DAT");*/103 95 fp = xfopen(s, "w", pszSrcFile, __LINE__); 104 96 if (fp) { -
trunk/dll/valid.c
r946 r1104 26 26 30 Dec 07 GKY Change TestDates to TestFDates can compare by filename or FDATE/FTIME data 27 27 30 Dec 07 GKY Add TestCDates to compare CNRITEMs by CDATE/CTIME data 28 19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory 28 29 29 30 ***********************************************************************/ … … 547 548 } 548 549 else 549 s ave_dir2(path); // Fall back to fm3.ini drive or current dir - should never occur550 strcpy(path, pFM2SaveDirectory); // Fall back to fm3.ini drive or current dir - should never occur 550 551 return path; 551 552 } -
trunk/dll/viewinf.c
r1082 r1104 544 544 } 545 545 BldFullPathName(filename, pFM2SaveDirectory, "FM2VINF.CMD"); 546 /*save_dir2(filename);547 if (filename[strlen(filename) - 1] != '\\')548 strcat(filename, "\\");549 strcat(filename, "FM2VINF.CMD");*/550 546 fp = xfopen(filename, "w", pszSrcFile, __LINE__); 551 547 if (fp) { -
trunk/dll/walkem.c
r1082 r1104 357 357 fUdirsChanged = FALSE; 358 358 BldFullPathName(s, pFM2SaveDirectory, "USERDIRS.DAT"); 359 /*save_dir2(s);360 if (s[strlen(s) - 1] != '\\')361 strcat(s, "\\");362 strcat(s, "USERDIRS.DAT");*/363 359 fp = _fsopen(s, "r", SH_DENYWR); 364 360 if (fp) { … … 407 403 if (udirhead) { 408 404 BldFullPathName(s, pFM2SaveDirectory, "USERDIRS.DAT"); 409 /*save_dir2(s);410 if (s[strlen(s) - 1] != '\\')411 strcat(s, "\\");412 strcat(s, "USERDIRS.DAT");*/413 405 fp = xfopen(s, "w", pszSrcFile, __LINE__); 414 406 if (fp) { … … 773 765 wa->nounwriteable = TRUE; 774 766 if (!*wa->szReturnPath) 775 s ave_dir2(wa->szCurrentPath);767 strcpy(wa->szCurrentPath, pFM2SaveDirectory); 776 768 else { 777 769 strcpy(wa->szCurrentPath, wa->szReturnPath); … … 1397 1389 } 1398 1390 if (!*wa->szCurrentPath1) 1399 s ave_dir2(wa->szCurrentPath1);1391 strcpy(wa->szCurrentPath1, pFM2SaveDirectory); 1400 1392 MakeFullName(wa->szCurrentPath1); 1401 1393 if (!*wa->szCurrentPath2) 1402 s ave_dir2(wa->szCurrentPath2);1394 strcpy(wa->szCurrentPath2, pFM2SaveDirectory); 1403 1395 MakeFullName(wa->szCurrentPath2); 1404 1396 WinSendDlgItemMsg(hwnd,
Note:
See TracChangeset
for help on using the changeset viewer.