Changeset 1082

Timestamp:

07/20/08 00:37:36 (6 weeks 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.

Location:

trunk

Files:

• av2.c (modified) (1 diff)
• databar.c (modified) (1 diff)
• dll/arccnrs.c (modified) (11 diffs)
• dll/assoc.c (modified) (3 diffs)
• dll/avl.c (modified) (3 diffs)
• dll/cmdline.c (modified) (4 diffs)
• dll/command.c (modified) (3 diffs)
• dll/copyf.c (modified) (6 diffs)
• dll/dircnrs.c (modified) (1 diff)
• dll/dirsize.c (modified) (3 diffs)
• dll/filter.c (modified) (4 diffs)
• dll/fm3dll.h (modified) (4 diffs)
• dll/grep2.c (modified) (4 diffs)
• dll/inis.c (modified) (4 diffs)
• dll/init.c (modified) (6 diffs)
• dll/loadbmp.c (modified) (3 diffs)
• dll/remap.c (modified) (5 diffs)
• dll/saveclip.c (modified) (8 diffs)
• dll/systemf.c (modified) (3 diffs)
• dll/tools.c (modified) (4 diffs)
• dll/viewinf.c (modified) (4 diffs)
• dll/walkem.c (modified) (7 diffs)

trunk/av2.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2007 Steven H. Levine
+  Copyright (c) 2007, 2008 Steven H. Levine
 
   23 Sep 07 SHL Sync with standards

trunk/databar.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005 Steven H. Levine
+  Copyright (c) 2005, 2008 Steven H. Levine
 
   Oct 15 21:42:56 2002 967 ______ databar.c

trunk/dll/arccnrs.c

@@ -55 +55 @@
   14 Jul 08 JBS Ticket 126: Add support for WPS open default & open settings in arccnrs
   16 Jul 08 GKY Fix trap on viewing multiple files from an archive (misplaced free)
-  16 JUL 08 GKY Use TMP directory for temp files if present.
+  16 Jul 08 GKY Use TMP directory for temp files if present. Use MakeTempName
 
 ***********************************************************************/
@@ -424 +424 @@
   HFILE newstdout;
   CHAR s[CCHMAXPATH * 2], lonename[CCHMAXPATH + 2],
-       *nsize, *osize, *fdate, *fname, *p, *pp, arctemp[CCHMAXPATH];
+       *nsize, *osize, *fdate, *fname, *p, *pp, *arctemp;
   BOOL gotstart;
   BOOL gotend;
@@ -442 +442 @@
   if (!info)
     info = find_type(arcname, NULL);
-  for (x = 0; x < 99; x++) {
+  arctemp = xmallocz(CCHMAXPATH, pszSrcFile, __LINE__);
+  MakeTempName(arctemp, ArcTempRoot, 2);
+  /*for (x = 0; x < 99; x++) {
     sprintf(arctemp, "%s.%03x", ArcTempRoot, (clock() & 4095L));
     if (IsFile(arctemp) == 1)
@@ -448 +450 @@
     else
       break;
-  }
+  } */
+
+  //printf("%s\r", arctemp); fflush(stdout);
 
 ReTry:
@@ -508 +512 @@
     else {
       fp = xfopen(arctemp, "w", pszSrcFile, __LINE__);
-      if (!fp)
-        return 0;
+      if (!fp) {
+        xfree(arctemp, pszSrcFile, __LINE__);
+        return 0;
+      }
       else {
         newstdout = -1;
@@ -516 +522 @@
         if (rc) {
           Dos_Error(MB_CANCEL, rc, hwndCnr, pszSrcFile, __LINE__,
-                    "DosDupHandle");
+                    "DosDupHandle");
+          xfree(arctemp, pszSrcFile, __LINE__);
           return 0;
         }
@@ -526 +533 @@
             Dos_Error(MB_CANCEL, rc, hwndCnr, pszSrcFile, __LINE__,
                       "DosDupHandle");
-            return 0;
+            xfree(arctemp, pszSrcFile, __LINE__);
+            return 0;
           }
           else {
@@ -786 +794 @@
     DosError(FERR_DISABLEHARDERR);
     DosForceDelete(arctemp);
+    xfree(arctemp, pszSrcFile, __LINE__);
   }
 
@@ -1484 +1493 @@
         free(s);
         if (IsFile(filename) == 1) {
-#if 0 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
+#if 1 // 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
@@ -1769 +1778 @@
                 if (p) {
                   BldFullPathName(p, li->targetpath, temp);
-                  /*strcpy(p, li->targetpath);
-                  if (p[strlen(p) - 1] != '\\')
-                    strcat(p, "\\");
-                  strcat(p, temp);*/
                   li->list[x] = p;
                   free(temp);
@@ -3535 +3540 @@
         dcd->id = id;
         dcd->type = ARC_FRAME;
-        if (!pTmpDir) {
-          save_dir2(dcd->workdir);
-          if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
+        if (!pTmpDir)
+          save_dir2(dcd->workdir);
+        MakeTempName(dcd->workdir, ArcTempRoot, 2);
+          /*if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
             strcat(dcd->workdir, "\\");
           sprintf(dcd->workdir + strlen(dcd->workdir), "%s.%03x",
                   ArcTempRoot, (clock() & 4095));
-        }
         else
           sprintf(dcd->workdir, "%s.%03x",
-                  ArcTempRoot, (clock() & 4095));
+                  ArcTempRoot, (clock() & 4095));*/
         strcpy(dcd->arcname, fullname);
         if (*extractpath) {

trunk/dll/assoc.c

@@ -18 +18 @@
   29 Feb 08 GKY Changes to enable user settable command line length
   29 Feb 08 GKY Use xfree where appropriate
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 **************************************************************************************/
@@ -142 +143 @@
     free_associations();
   assloaded = TRUE;
-  save_dir2(mask);
+  BldFullPathName(mask, pFM2SaveDirectory, "ASSOC.DAT");
+  /*save_dir2(mask);
   if (mask[strlen(mask) - 1] != '\\')
     strcat(mask, "\\");
-  strcat(mask, "ASSOC.DAT");
+  strcat(mask, "ASSOC.DAT");*/
   fp = _fsopen(mask, "r", SH_DENYWR);
   pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
@@ -267 +269 @@
   }
 #endif
-  save_dir2(s);
+  /*save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
-  strcat(s, "ASSOC.DAT");
+    strcat(s, "ASSOC.DAT");*/
+  BldFullPathName(s, pFM2SaveDirectory, "ASSOC.DAT");
   fp = xfopen(s, "w", pszSrcFile, __LINE__);
   if (fp) {

trunk/dll/avl.c

@@ -31 +31 @@
   25 Aug 07 SHL load_archivers: add missing close on error path
   29 Feb 08 GKY Use xfree where appropriate
-  22 Jun 08 GKY Added free_archivers fot fortify checking
+  22 Jun 08 GKY Added free_archivers for fortify checking
+  19 Jul 08 GKY ifdef Fortify free_archivers
 
 ***********************************************************************/
@@ -218 +219 @@
 }
 
+# ifdef FORTIFY
+
 VOID free_archivers(VOID)
 {
@@ -247 +250 @@
 
 //=== free_arc_type() free allocated ARC_TYPE ===
+
+# endif
 
 VOID free_arc_type(ARC_TYPE * pat)

trunk/dll/cmdline.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2007 Steven H.Levine
+  Copyright (c) 2004, 2008 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -18 +18 @@
   29 Feb 08 GKY Use xfree where appropriate
   20 Apr 08 GKY New variable names; Save and Load command lines of user set length
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 ***********************************************************************/
@@ -74 +75 @@
     else
       MiniLoaded = TRUE;
-    save_dir2(pszCmdLine);
+    BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+    /*save_dir2(pszCmdLine);
     if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
       strcat(pszCmdLine, "\\");
-    strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+    strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");*/
     fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
     if (fp) {
@@ -130 +132 @@
   if (!pszCmdLine)
     return;
-  save_dir2(pszCmdLine);
+  BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+  /*save_dir2(pszCmdLine);
   if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
     strcat(pszCmdLine, "\\");
-  strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+  strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");*/
   if (CmdLineHead) {
     fp = xfopen(pszCmdLine, "w", pszSrcFile, __LINE__);

trunk/dll/command.c

@@ -25 +25 @@
   29 Feb 08 GKY Use xfree where appropriate
   18 Jul 08 SHL Add Fortify support
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 ***********************************************************************/
@@ -331 +332 @@
   pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (pszCmdLine) {
-    save_dir2(pszCmdLine);
+    BldFullPathName(pszCmdLine, pFM2SaveDirectory, "COMMANDS.DAT");
+    /*save_dir2(pszCmdLine);
     if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
       strcat(pszCmdLine, "\\");
-    strcat(pszCmdLine, "COMMANDS.DAT");
+    strcat(pszCmdLine, "COMMANDS.DAT");*/
     fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
     if (fp) {
@@ -399 +401 @@
     return;
   info = cmdhead;
-  save_dir2(s);
+  BldFullPathName(s, pFM2SaveDirectory, "COMMANDS.DAT");
+  /*save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
-  strcat(s, "COMMANDS.DAT");
+  strcat(s, "COMMANDS.DAT");*/
   fp = xfopen(s, "w", pszSrcFile, __LINE__);
   if (fp) {

trunk/dll/copyf.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2006 Steven H.Levine
+  Copyright (c) 2001, 2008 Steven H.Levine
 
   14 Sep 02 SHL Drop obsolete debug code
@@ -19 +19 @@
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
   29 Feb 08 GKY Use xfree where appropriate
+  19 Jul 08 GKY Modify MakeTempName for use making temp directory names
 
 ***********************************************************************/
@@ -49 +50 @@
 #endif
 
-char *MakeTempName(char *buffer)
+char *MakeTempName(char *buffer, char *temproot, INT type)
 {
   FILESTATUS3 fs3;
@@ -55 +56 @@
   char *p, *o;
 
+  if (strlen(buffer) > 3 && buffer[strlen(buffer) - 1] != '\\')
+    strcat(buffer, "\\");
   p = o = buffer + strlen(buffer);
-  sprintf(p, "%08lx.%03lx", clock(), mypid);
+  switch (type) {
+  case 0:
+    sprintf(p, "%08lx.%03lx", rand() & 4095L, mypid);
+    break;
+  case 1:
+    sprintf(p, "%s%04lx.%03lx", "$FM2", rand() & 4095L, mypid);
+    break;
+  case 2:
+    sprintf(p, "%s.%03x", temproot, (rand() & 4095));
+    break;
+  default:
+    break;
+  }
   p = buffer + (strlen(buffer) - 1);
   for (;;) {
@@ -510 +525 @@
           *p = 0;
         strcat(dir, "\\");
-        MakeTempName(dir);
+        MakeTempName(dir, NULL, 0);
         if (DosMove(fullnewname, dir))
           *dir = 0;
@@ -894 +909 @@
 #pragma alloc_text(LONGNAMES,TruncName,GetLongName,WriteLongName)
 #pragma alloc_text(LONGNAMES,ZapLongName,AdjustWildcardName)
-#pragma alloc_text(COPYF,default_disk,docopyf)
+#pragma alloc_text(COPYF,default_disk,docopyf,MakeTempName)
 #pragma alloc_text(UNLINKF,unlinkf,unlink_allf,make_deleteable,wipeallf)

trunk/dll/dircnrs.c

@@ -70 +70 @@
 #include "command.h"                    // RunCommand
 #include "fm3dll.h"
-#include "avl.h"                        // free_archivers
+//#include "avl.h"                      // free_archivers
 #ifdef FORTIFY
 #include "misc.h"                       // GetTidForThread

trunk/dll/dirsize.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2007 Steven H. Levine
+  Copyright (c) 2001, 2008 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -34 +34 @@
   29 Feb 08 GKY Add presparams & update appearence of "Sizes" dialog
   07 Jul 08 GKY Fixed trap in PMCTLS (strlen) inadequate memory allocation
-  07 Jul o8 GKY Fixed trap by no longer allocating pci->pszLongName as flag but pointing isroot
+  07 Jul 08 GKY Fixed trap by no longer allocating pci->pszLongName as flag but pointing isroot
                 version to NullStr and all others to NULL.
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory; use pTmpDir for temp files
 
 ***********************************************************************/
@@ -927 +928 @@
         FILE *fp;
 
-        save_dir2(szFileName);
+        if (pTmpDir)
+          strcpy(szFileName, pTmpDir);
+        else
+          strcpy(szFileName, pFM2SaveDirectory);
+        //save_dir2(szFileName);
         sprintf(&szFileName[strlen(szFileName)], "\\%csizes.Rpt",
                 (pState) ? toupper(*pState->szDirName) : '+');

trunk/dll/filter.c

@@ -15 +15 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   29 Feb 08 GKY Use xfree where appropriate
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 ***********************************************************************/
@@ -30 +31 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -133 +135 @@
 
   loadedmasks = TRUE;
-  save_dir2(s);
+  BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT");
+  /*save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
-  strcat(s, "FILTERS.DAT");
+  strcat(s, "FILTERS.DAT");*/
   fp = _fsopen(s, "r", SH_DENYWR);
   if (fp) {
@@ -175 +178 @@
     return;
   if (maskhead) {
-    save_dir2(s);
+    BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT");
+    /*save_dir2(s);
     if (s[strlen(s) - 1] != '\\')
       strcat(s, "\\");
-    strcat(s, "FILTERS.DAT");
+    strcat(s, "FILTERS.DAT");*/
     fp = xfopen(s, "w", pszSrcFile, __LINE__);
     if (fp) {

trunk/dll/fm3dll.h

@@ -84 +84 @@
                 DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
   16 JUL 08 GKY Use TMP directory for temp files
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use MakeTempName; Remove LISTTEMPROOT
 
 ***********************************************************************/
@@ -229 +230 @@
 #define ALLATTRS                (FILE_NORMAL | FILE_DIRECTORY | FILE_ARCHIVED |\
                                  FILE_HIDDEN | FILE_READONLY | FILE_SYSTEM)
-#define LISTTEMPROOT            "$FM2LI$T."
+//#define LISTTEMPROOT            "$FM2LI$T"
 
 #include "fm3dll2.h"
@@ -630 +631 @@
 CHAR default_disk(VOID);
 APIRET docopyf(INT type, CHAR * oldname, CHAR * newname, ...);
+char *MakeTempName(char *buffer, char *temproot, int type);
 
 #define COPY 0
@@ -1111 +1113 @@
              hwndLED, hwndLEDHdr, hwndAutoMLE, hwndCmdlist;
 DATADEF HBITMAP hbmLEDon, hbmLEDoff;
-DATADEF CHAR ArcTempRoot[CCHMAXPATH], ThousandsSeparator[2], *pTmpDir;
+DATADEF CHAR ArcTempRoot[CCHMAXPATH], ThousandsSeparator[2], *pTmpDir, *pFM2SaveDirectory;
 DATADEF HPOINTER hptrArrow, hptrBusy, hptrLast, hptrDir, hptrFile, hptrRemote,
   hptrFloppy, hptrDrive, hptrRemovable, hptrCDROM,hptrVirtual,hptrRamdisk,

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) {

trunk/dll/inis.c

@@ -26 +26 @@
   09 Jan 08 SHL Use CloseProfile to avoid spurious system INI closes
   29 Feb 08 GKY Use xfree where appropriate
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory or pTmpDir and use BldFullPathName
 
 ***********************************************************************/
@@ -46 +47 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -1134 +1136 @@
         /* make copies of new inis */
         *tempuserini = 0;
-        *tempsysini = 0;
-        save_dir2(tempuserini);
+        *tempsysini = 0;
+        BldFullPathName(tempuserini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPUSER.INI");
+        /*save_dir2(tempuserini);
         if (tempuserini[strlen(tempuserini) - 1] != '\\')
           strcat(tempuserini, "\\");
-        strcat(tempuserini, "TEMPUSER.INI");
+        strcat(tempuserini, "TEMPUSER.INI");*/
         rc = DosCopy(userini, tempuserini, DCPY_EXISTING);
         if (rc) {
@@ -1148 +1151 @@
                     GetPString(IDS_COMPCOPYFAILEDTEXT), userini, tempuserini);
           break;
-        }
-        save_dir2(tempsysini);
+        }
+        BldFullPathName(tempsysini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPSYS.INI");
+        /*save_dir2(tempsysini);
         if (tempsysini[strlen(tempsysini) - 1] != '\\')
           strcat(tempsysini, "\\");
-        strcat(tempsysini, "TEMPSYS.INI");
+        strcat(tempsysini, "TEMPSYS.INI");*/
         rc = DosCopy(sysini, tempsysini, DCPY_EXISTING);
         if (rc) {

trunk/dll/init.c

@@ -51 +51 @@
   16 JUL 08 GKY Use TMP directory for temp files
   17 Jul 08 SHL Reduce code bulk in fUseTmp setup
+  19 Jul 08 GKY Use pFM2SaveDirectory, MakeTempName and move temp files to TMP subdirectory if (TMP).
 
 ***********************************************************************/
@@ -514 +515 @@
     }
   }
-
-  save_dir(s);
+  if (pTmpDir)
+    strcpy(s, pTmpDir);
+  else
+    save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
   enddir = &s[strlen(s)];
-  strcat(s, LISTTEMPROOT);
+  strcat(s, "$FM2LI$T");
   strcat(s, "???");
   search_handle = HDIR_CREATE;
@@ -541 +544 @@
   BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
   DosForceDelete(szTempFile);
+  if (pTmpDir) {
+    wipeallf("%s\\*", pTmpDir);
+    DosDeleteDir(pTmpDir);
+  }
   EndNote();
   if (FM3ModHandle)
@@ -650 +657 @@
   }
 
-  /* set up default root names for temp archive goodies */
+  // set up default root names for temp file storage and archive goodies
   env = getenv("TMP");
   if (env == NULL)
@@ -659 +666 @@
     if (!rc) {
       if (fs3.attrFile & FILE_DIRECTORY) {
-        // 17 Jul 08 SHL fixme to check writable someday