Changeset 1082 for trunk/dll/grep2.c

Timestamp:

07/20/08 00:37:36 (5 months ago)

Author:

gyoung

Message:

Changes so FM2 will use TMP/TEMP directory for all temp files; Replaced save_dir2 with global variable so BldFullPathName? could easily replace code that performed the same function; Added #ifdef FORTIFY to free_ function that are only used when fortified.

Files:

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

trunk/dll/grep2.c

@@ -20 +20 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
   fixme for more excess locals to be gone
@@ -42 +43 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -268 +270 @@
     WinEnableWindow(WinWindowFromID(hwnd, GREP_NOSIZEDUPES), FALSE);
 
-    save_dir2(s);
+    BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
+    /*save_dir2(s);
     if (s[strlen(s) - 1] != '\\')
       strcat(s, "\\");
-    strcat(s, "GREPMASK.DAT");
+    strcat(s, "GREPMASK.DAT");*/
     fp = _fsopen(s, "r", SH_DENYWR);
     if (fp) {
@@ -947 +950 @@
                                             LM_QUERYITEMCOUNT,
                                             MPVOID, MPVOID);
-        if (sSelect > 0) {
-          save_dir2(s);
+        if (sSelect > 0) {
+          BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
+          /*save_dir2(s);
           if (s[strlen(s) - 1] != '\\')
             strcat(s, "\\");
-          strcat(s, "GREPMASK.DAT");
+          strcat(s, "GREPMASK.DAT");*/
           fp = xfopen(s, "w", pszSrcFile, __LINE__);
           if (fp) {