Changeset 1082 for trunk/dll/arccnrs.c

Timestamp:

Jul 20, 2008, 12:37:36 AM (17 years ago)

Author:

Gregg Young

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.

File:

• trunk/dll/arccnrs.c (modified) (11 diffs)

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