Changeset 1073 for trunk/dll/sysinfo.c

Timestamp:

Jul 18, 2008, 2:30:20 AM (17 years ago)

Author:

Gregg Young

Message:

Fm2 uses TMP/TEMP directory if set for temporary files and directories. Ticket 20

File:

• trunk/dll/sysinfo.c (modified) (6 diffs)

trunk/dll/sysinfo.c

@@ -24 +24 @@
 #define INCL_LONGLONG
 
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dlg.h"
 #include "fm3dll.h"
@@ -34 +35 @@
 {
   HWND hwnd = (HWND) arg;
-  CHAR s[2048], *p;
+  CHAR s[2048], *p, szTempFile[CCHMAXPATH];
   HAB thab;
   HMQ thmq;
@@ -48 +49 @@
     if (!WinIsWindow(thab, hwnd))
       goto Abort;
-    unlinkf("%s", "$RMVIEW.#$#");
-    fp = xfopen("$RMVIEW.#$#", "w", pszSrcFile, __LINE__);
+    if (fUseTmp)
+      BldFullPathName(szTempFile, pTmpDir, "$RMVIEW.#$#");
+    else
+      strcpy(szTempFile, "$RMVIEW.#$#");
+    unlinkf("%s", szTempFile);
+    fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
     if (!fp)
       goto Abort;
@@ -62 +67 @@
       runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
               hwnd, pszSrcFile, __LINE__,
-              NULL, NULL, "%s", "RMVIEW.EXE");
+              NULL, NULL, "%s", szTempFile);
       oldstdout = fileno(stdout);
       DosDupHandle(newstdout, &oldstdout);
@@ -70 +75 @@
     if (!WinIsWindow(thab, hwnd))
       goto Abort;
-    fp = xfopen("$RMVIEW.#$#", "r", pszSrcFile, __LINE__);
+    fp = xfopen(szTempFile, "r", pszSrcFile, __LINE__);
     if (fp) {
       xfgets(s, sizeof(s), fp, pszSrcFile, __LINE__);
@@ -98 +103 @@
     WinTerminate(thab);
   }
-  DosForceDelete("$RMVIEW.#$#");
+  if (szTempFile)
+    DosForceDelete(szTempFile);
 }