Changeset 1069 for trunk/dll/arccnrs.c

Timestamp:

Jul 17, 2008, 1:53:38 AM (17 years ago)

Author:

Gregg Young

Message:

Fixes trap on viewing multiple files from an archive Ticket 248. Also includes initial code for using TMP directory for Temp files.

File:

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

trunk/dll/arccnrs.c

@@ -54 +54 @@
   29 Feb 08 GKY Use xfree where appropriate
   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.
 
 ***********************************************************************/
@@ -422 +424 @@
   HFILE newstdout;
   CHAR s[CCHMAXPATH * 2], lonename[CCHMAXPATH + 2],
-       *nsize, *osize, *fdate, *fname, *p, *pp, arctemp[33];
+       *nsize, *osize, *fdate, *fname, *p, *pp, arctemp[CCHMAXPATH];
   BOOL gotstart;
   BOOL gotend;
@@ -1498 +1500 @@
 
       if (li && li->list && li->list[0]) {
+        printf("%x/r", li->type); fflush(stdout);
         switch (li->type) {
         case IDM_ARCHIVE:
@@ -1722 +1725 @@
              do {
                for (x = z; li->list[x] &&
-                   strlen(pszCmdLine) + strlen(li->list[x]) < 999; x++) {
+                   strlen(pszCmdLine) + strlen(li->list[x]) < MaxComLineStrg - 1 ; x++) {
                 strcat(pszCmdLine, " ");
                 BldQuotedFileName(pszCmdLine + strlen(pszCmdLine), li->list[x]);
@@ -1736 +1739 @@
                       (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
                       WAIT, hwnd, pszSrcFile, __LINE__,
-                      li->targetpath, NULL, "%s", pszCmdLine);
+                      li->targetpath, NULL, "%s", pszCmdLine);
               *endofit = 0;
             } while (li->list[x]);
@@ -1754 +1757 @@
                 p = xmalloc(strlen(temp) + strlen(li->targetpath) + 2,
                             pszSrcFile, __LINE__);
-                if (p) {
-                  strcpy(p, li->targetpath);
+                if (p) {
+                  BldFullPathName(p, li->targetpath, temp);
+                  /*strcpy(p, li->targetpath);
                   if (p[strlen(p) - 1] != '\\')
                     strcat(p, "\\");
-                  strcat(p, temp);
+                  strcat(p, temp);*/
                   li->list[x] = p;
                   free(temp);
@@ -1823 +1827 @@
                     }
                   }
-                }
+                }
                 BldFullPathName(pszCmdLine, li->targetpath, li->list[x]);
                 temp = li->list[x];
                 li->list[x] = xstrdup(pszCmdLine, pszSrcFile, __LINE__);
-                free(pszCmdLine);
                 if (!li->list[x])
                   li->list[x] = temp;
                 else
                   xfree(temp, pszSrcFile, __LINE__);
-              }
+              }
+              free(pszCmdLine);
               if (li->type == IDM_VIEW || li->type == IDM_EDIT) {
 
@@ -1852 +1856 @@
               if (li->type == IDM_MCIPLAY) {
 
-                FILE *fp;
-
-                fp = xfopen("$FM2PLAY.$$$", "w", pszSrcFile, __LINE__);
+                FILE *fp;
+                CHAR TempFile[CCHMAXPATH];
+
+                if (fUseTmp)
+                  BldFullPathName(TempFile, pTmpDir, "$FM2PLAY.$$$");
+                else
+                  strcpy(TempFile, "$FM2PLAY.$$$");
+
+                fp = xfopen(TempFile, "w", pszSrcFile, __LINE__);
                 if (fp) {
                   fprintf(fp, "%s", ";AV/2-built FM2Play listfile\n");
@@ -1860 +1870 @@
                     fprintf(fp, "%s\n", li->list[x]);
                   fprintf(fp, ";end\n");
-                  fclose(fp);
-                  RunFM2Util("FM2PLAY.EXE", "/@$FM2PLAY.$$$");
+                  fclose(fp);
+                  strrev(TempFile);
+                  strcat(TempFile, "@/");
+                  strrev(TempFile);
+                  RunFM2Util("FM2PLAY.EXE", TempFile);
                 }
               }
@@ -1928 +1941 @@
                   }
         }
-                
+
               }
               else {
@@ -2948 +2961 @@
       case IDM_OPENDEFAULT:
       case IDM_OPENSETTINGS:
+      case IDM_MCIPLAY:
         {
           LISTINFO *li;
@@ -3012 +3026 @@
             case IDM_VIRUSSCAN:
             case IDM_OPENDEFAULT:
-            case IDM_OPENSETTINGS:
+            case IDM_OPENSETTINGS:
+            case IDM_MCIPLAY:
               strcpy(li->targetpath, dcd->workdir);
               break;
@@ -3514 +3529 @@
         dcd->id = id;
         dcd->type = ARC_FRAME;
-        save_dir2(dcd->workdir);
-        if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
-          strcat(dcd->workdir, "\\");
-        sprintf(dcd->workdir + strlen(dcd->workdir), "%s.%03x",
-                ArcTempRoot, (clock() & 4095));
+        if (!fUseTmp) {
+          save_dir2(dcd->workdir);
+          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));
         strcpy(dcd->arcname, fullname);
         if (*extractpath) {