Changeset 1689 for trunk/dll/arccnrs.c

Timestamp:

Jul 31, 2013, 1:22:48 AM (12 years ago)

Author:

Gregg Young

Message:

Changes to get 7z archives to work with AV. Includes an ugly hack to compensate for the fact that the compressed size is missing from some files in some archives. This results in the filename being put in the nsize variable which then must be passed to fname. Fortunately it displays compressed size as 0 since it can't deal with the non numeric text string. A file name that is all numeric will show odd results. Ticket 492

File:

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

trunk/dll/arccnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2010 Steven H. Levine
+  Copyright (c) 2001, 2013 Steven H. Levine
 
   11 Jun 02 SHL Ensure archive name not garbage
@@ -81 +81 @@
                 aren't user settable; realappname should be used for setting applicable to
                 one or more miniapp but not to FM/2
-  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  17 Jan 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   15 Apr 10 JBS Ticket 422: Stop hang when open archive gets deleted or moved
   23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code
@@ -87 +87 @@
                 by temp file creation failures.
   13 Aug 11 GKY Change to Doxygen comment format
+  30 Jul 13 GKY Changes to allow 7z archiver to work with AV.
 
 ***********************************************************************/
@@ -727 +728 @@
           p = s;
           for (fieldnum = 0; fieldnum <= highest; fieldnum++) {
-            pp = p;
+            pp = p;
             while (*pp && (*pp == ' ' || *pp == '\t'))  // skip leading
               pp++;
-            if (!*pp)
-              break;
+            if (!*pp) {
+              if (fieldnum == info->fnpos && (!strcmp(strupr(info->ext), "7Z") ||
+                                             !strcmp(strupr(info->signature), "7Z")))
+                fname = nsize;// GKY 7-30-13 Work around for missing nsize field for some members of archive
+              break;
+            }
             wasquote = FALSE;
-            p = pp;
+            p = pp;
             while (*p && (wasquote ||
                           ((fieldnum != info->fnpos || !info->nameislast) ?
@@ -749 +754 @@
                 }
               }
-              else if (*p)
+              else if (*p) 
                 p++;
-            }
+            }
             if (*p) {
               *p = 0;
               p++;
-            }
+            }
             if (fieldnum == info->nsizepos)
               nsize = pp;
@@ -782 +787 @@
               }
             }
-            else if (fieldnum == info->fnpos) {
+            else if (fieldnum == info->fnpos) {
               fname = pp;
               if (pp && *pp == '*' && !*(pp + 1))       // workaround for LH.EXE
@@ -793 +798 @@
               break;
             }
-          }
+          } // for fldnum
           if (info->nameisnext) {
             if (!xfgets_bstripcr