Changeset 1073

Timestamp:

07/18/08 02:30:20 (7 weeks ago)

Author:

gyoung

Message:

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

Location:

trunk/dll

Files:

• arccnrs.c (modified) (8 diffs)
• init.c (modified) (1 diff)
• killproc.c (modified) (3 diffs)
• sysinfo.c (modified) (6 diffs)
• undel.c (modified) (5 diffs)

trunk/dll/arccnrs.c

@@ -339 +339 @@
   if (pai->pszFileName && pai->pszFileName != NullStr) {
     psz = pai->pszFileName;
-    pai->pszFileName = NullStr;
+    pai->pszFileName = NULL;
     free(psz);
   }
@@ -1474 +1474 @@
         free(s);
         if (IsFile(filename) == 1) {
-#if 1 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
+#if 0 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
           if (fViewChild && fArcStuffVisible)
             DosSleep(100);  // Allow unzip session to finish closing 14 Mar 07 SHL
@@ -1857 +1857 @@
 
                 FILE *fp;
-                CHAR TempFile[CCHMAXPATH];
+                CHAR szTempFile[CCHMAXPATH];
 
                 if (fUseTmp)
-                  BldFullPathName(TempFile, pTmpDir, "$FM2PLAY.$$$");
+                  BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
                 else
-                  strcpy(TempFile, "$FM2PLAY.$$$");
-
-                fp = xfopen(TempFile, "w", pszSrcFile, __LINE__);
+                  strcpy(szTempFile, "$FM2PLAY.$$$");
+
+                fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
                 if (fp) {
                   fprintf(fp, "%s", ";AV/2-built FM2Play listfile\n");
@@ -1871 +1871 @@
                   fprintf(fp, ";end\n");
                   fclose(fp);
-                  strrev(TempFile);
-                  strcat(TempFile, "@/");
-                  strrev(TempFile);
-                  RunFM2Util("FM2PLAY.EXE", TempFile);
+                  strrev(szTempFile);
+                  strcat(szTempFile, "@/");
+                  strrev(szTempFile);
+                  RunFM2Util("FM2PLAY.EXE", szTempFile);
                 }
               }
@@ -1988 +1988 @@
               }
               BldFullPathName(fullname, dcd->directory, li->list[x]);
-              // sprintf(fullname, "%s%s%s", dcd->directory,
-              //              (dcd->directory[strlen(dcd->directory) - 1] == '\\') ?
-              //              NullStr : "\\", li->list[x]);
               if (IsFile(fullname) != -1)
                 if (AddToList(fullname, &list2, &numfiles, &numalloced))
@@ -2000 +1997 @@
                   if (*p) {
                     BldFullPathName(fullname, dcd->directory, p);
-                    // sprintf(fullname, "%s%s%s", dcd->directory,
-                    //      (dcd->directory[strlen(dcd->directory) - 1] ==
-                    //         '\\') ? NullStr : "\\",
-                    //      p);
                     if (IsFile(fullname) != -1)
                       if (AddToList(fullname, &list2, &numfiles, &numalloced))
@@ -2056 +2049 @@
       free(dcd);
 #     ifdef FORTIFY
-      Fortify_LeaveScope();
+      //Fortify_LeaveScope();
 #      endif
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
@@ -3042 +3035 @@
                 UnHilite(hwnd, TRUE, &dcd->lastselection, 0);
             }
-            else
+            else {
               free(li);
-#           ifdef FORTIFY
-            Fortify_LeaveScope();
-#           endif
+#             ifdef FORTIFY
+              Fortify_LeaveScope();
+#              endif
+            }
           }
         }

trunk/dll/init.c

@@ -537 +537 @@
     DosFindClose(search_handle);
   }
-
-  DosForceDelete("$FM2PLAY.$$$");
+  if (fUseTmp) {
+    CHAR szTempFile[CCHMAXPATH];
+
+    BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+    DosForceDelete(szTempFile);
+  }
+  else
+    DosForceDelete("$FM2PLAY.$$$");
 
   EndNote();

trunk/dll/killproc.c

@@ -37 +37 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -236 +237 @@
 
   WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-  strcpy(s, "$PSTAT#$.#$#");
+  if (fUseTmp)
+    BldFullPathName(s, pTmpDir, "$PSTAT#$.#$#");
+  else
+    strcpy(s, "$PSTAT#$.#$#");
   unlinkf("%s", s);
   fp = fopen(s, "w");
@@ -303 +307 @@
   }
 Abort:
-  DosForceDelete("$PSTAT#$.#$#");
+  if (fUseTmp) {
+    CHAR szTempFile[CCHMAXPATH];
+
+    BldFullPathName(szTempFile, pTmpDir, "$PSTAT#$.#$#");
+    DosForceDelete(szTempFile);
+  }
+  else
+    DosForceDelete("$PSTAT#$.#$#");
   PostMsg(hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
   WinDestroyMsgQueue(thmq);

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);
 }
 

trunk/dll/undel.c

@@ -31 +31 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -48 +49 @@
 {
   HWND hwnd;
-  CHAR s[CCHMAXPATH * 2];
+  CHAR s[CCHMAXPATH * 2], szTempFile[CCHMAXPATH];
   CHAR *path;
   HAB thab;
@@ -72 +73 @@
     IncrThreadUsage();
     WinSendDlgItemMsg(hwnd, UNDEL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-    unlinkf("%s", "$UDELETE.#$#");
-    fp = xfopen("$UDELETE.#$#", "w", pszSrcFile, __LINE__);
+    if (fUseTmp)
+      BldFullPathName(szTempFile, pTmpDir, "$UDELETE.#$#");
+    else
+      strcpy(szTempFile, "$UDELETE.#$#");
+    unlinkf("%s", szTempFile);
+    fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
     if (!fp) {
       Win_Error(NULLHANDLE, hwnd, pszSrcFile, __LINE__,
@@ -103 +108 @@
       fclose(fp);
     }
-    fp = xfopen("$UDELETE.#$#", "r", pszSrcFile, __LINE__);
+    fp = xfopen(szTempFile, "r", pszSrcFile, __LINE__);
     if (fp) {
       xfgets(s, sizeof(s), fp, pszSrcFile, __LINE__);   // Skip 1st line
@@ -150 +155 @@
     ;
   }
-  DosForceDelete("$UDELETE.#$#");
+  DosForceDelete(szTempFile);
   xfree(undelinfo, pszSrcFile, __LINE__);
   if (thmq) {