Changeset 1073 for trunk/dll/arccnrs.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/arccnrs.c (modified) (8 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
+            }
           }
         }