Changeset 1689

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

Location:

trunk

Files:

• archiver.tmp (modified) (34 diffs)
• dll/arccnrs.c (modified) (7 diffs)

trunk/archiver.tmp

@@ -147 +147 @@
 7,1,0,0
 ;
-;
-; Entry #3 - PKZIP 2.50 named PKZip (true OS/2 executable).
+; Entry #3 (7z)
+;
+7z
+7z
+0
+7za.exe l
+7za.exe e
+7za.exe x
+7za.exe t
+7za.exe a
+
+
+
+
+7za.exe d
+7z
+------------------- ----- ------------ ------------  ------------------------
+------------------- ----- ------------ ------------  ------------------------
+3
+4
+0,4
+1
+5,1,0,0
+;
+;
+; Entry #4 - PKZIP 2.50 named PKZip (true OS/2 executable).
 ;
 PKZip 2.50
@@ -172 +196 @@
 8,1,0,0
 ;
-; Entry #4 - InfoZip unzipsfx self-extractors.
+; Entry #5 - InfoZip unzipsfx self-extractors.
 ;
 unzipsfx
@@ -197 +221 @@
 ;
 ;
-; Entry #5 - PKWare PKZIP self-extractors type 1.
+; Entry #6 - PKWare PKZIP self-extractors type 1.
 ;
 PK(Un)Zip SE #1
@@ -221 +245 @@
 8,0,0,0
 ;
-; Entry #6 - is for PKWare PKZIP self-extractors type 2.
+; Entry #7 - is for PKWare PKZIP self-extractors type 2.
 ;
 PK(Un)Zip SE #2
@@ -246 +270 @@
 ;
 ;
-; Entry #7 - PKWare PKZIP self-extractors type 3.
+; Entry #8 - PKWare PKZIP self-extractors type 3.
 ;
 PK(Un)Zip SE #2
@@ -271 +295 @@
 ;
 ;
-; Entry #8 - TAR 1.15.1 from Gregg Young
+; Entry #9 - TAR 1.15.1 from Gregg Young
 ;
 TAR 1.15.1 (or higher)
@@ -295 +319 @@
 5,1,0,0
 ;
-; Entry #9 - TAR 1.1.0.
+; Entry #10 - TAR 1.1.0.
 ;
 TAR 1.10
@@ -320 +344 @@
 ;
 ;
-; Entry #10 (tar.gz)
+; Entry #11 (tar.gz)
 ;
 TAR.GZ (Req. TAR 1.15+ & GZIP)
@@ -344 +368 @@
 7,1,0,0
 ;
-; Entry #11 (tar.bz2)
+; Entry #12 (tar.bz2)
 ;
 TAR.BZ2 (Req. TAR 1.15+ & BZIP2)
@@ -368 +392 @@
 5,1,0,0
 ;
-; Entry #12 - GZIP (GZ).
+; Entry #13 - GZIP (GZ).
 ;
 GZIP (GZ) (req. GZIP & TAR 1.15+)
@@ -392 +416 @@
 5,1,0,0
 ;
-; Entry #13 - GZIP (Z).
+; Entry #14 - GZIP (Z).
 ;
 GZIP (Z)
@@ -416 +440 @@
 8,0,0,0
 ;
-; Entry #14 - Unarj 2.30 demo version.
+; Entry #15 - Unarj 2.30 demo version.
 ; Don't use Unarj 2.41; it's broken.
 ;
@@ -441 +465 @@
 0,0,0,0
 ;
-; Entry #15 - Arj 2.00 (DOS).
+; Entry #16 - Arj 2.00 (DOS).
 ; Note that other programs that use this control file may not be able to
 ; handle calling a DOS archiver correctly!  FM/2 is the only one that I
@@ -469 +493 @@
 0,0,0,0
 ;
-; Entry #16 (RAR v.3.5)
+; Entry #17 (RAR v.3.5)
 ;
 RAR v.3.5
@@ -493 +517 @@
 0,0,0,1
 ;
-; Entry #17 - RAR/2 v2, provided by Eugene Roshal.
+; Entry #18 - RAR/2 v2, provided by Eugene Roshal.
 ;
 RAR/2 v2
@@ -517 +541 @@
 0,0,0,1
 ;
-; Entry #18 - RAR/2 v.1.53beta OS/2 SFX.
+; Entry #19 - RAR/2 v.1.53beta OS/2 SFX.
 ;
 RAR/2 v.1.53beta OS/2 SFX
@@ -541 +565 @@
 0,0,0,1
 ;
-; Entry #19 - RAR v.1.53 DOS SFX.
+; Entry #20 - RAR v.1.53 DOS SFX.
 ;
 RAR v.1.53 DOS SFX
@@ -565 +589 @@
 0,0,0,1
 ;
-; Entry #20 - RAR v.2.00 SFX.
+; Entry #21 - RAR v.2.00 SFX.
 ;
 RAR v.2.00 SFX
@@ -590 +614 @@
 ;
 ;
-; Entry #21 - LHarc 2.22.
+; Entry #22 - LHarc 2.22.
 ; Supposedly fixes bugs in earlier versions.
 ; Actually seems to have done so.  Good work, Peter.
@@ -616 +640 @@
 2,1,0,0
 ;
-; Entry #22 - LHarc 2.22 using LH32 executable.
+; Entry #23 - LHarc 2.22 using LH32 executable.
 ;
 LHarc-32 2.22
@@ -640 +664 @@
 2,1,0,0
 ;
-; Entry #23 - LHarc 2.22 self-extractors..
+; Entry #24 - LHarc 2.22 self-extractors..
 ;
 LHarc 2.22 SE
@@ -664 +688 @@
 2,1,0,0
 ;
-; Entry #24 - LHA 2.12 (DOS) self-extractors.
+; Entry #25 - LHA 2.12 (DOS) self-extractors.
 ; LH 2.22 seems to recognize them
 ;
@@ -689 +713 @@
 2,1,0,0
 ;
-; Entry #25 - LHA 2.12 (DOS) self-extractors.
+; Entry #26 - LHA 2.12 (DOS) self-extractors.
 ; LH 2.22 seems to recognize them
 ;
@@ -714 +738 @@
 2,1,0,0
 ;
-; Entry #26 - LHA 2.13L (DOS) self-extractors.
+; Entry #27 - LHA 2.13L (DOS) self-extractors.
 ; LH 2.22 seems to recognize them
 ;
@@ -739 +763 @@
 2,1,0,0
 ;
-; Entry #27 - LH2 2.11.
+; Entry #28 - LH2 2.11.
 ; NOTE:  sometimes will put a file into an archive more than once, necessitating
 ; deleting both.  EAs not handled well, but at least they're handled.
@@ -765 +789 @@
 2,1,0,0
 ;
-; Entry #28 - ZIP 1.9/UNZIP 5.0 (available in 32-bit versions).
+; Entry #29 - ZIP 1.9/UNZIP 5.0 (available in 32-bit versions).
 ;ZIP/UNZIP should work with PKZIP 2.04 files.  Saves EAs well.  Won't
 ;extract a file stored with path without the path (actually, this seems
@@ -800 +824 @@
 7,1,0,0
 ;
-; Entry #29 - ZIP 1.9/UNZIP 5.0 using *32 executables.
+; Entry #30 - ZIP 1.9/UNZIP 5.0 using *32 executables.
 ;
 Zip/UnZip-32 1.9/5.0
@@ -824 +848 @@
 7,1,0,0
 ;
-; Entry #30 - ZIP 1.9/UNZIP 5.0, using the -l listing format.
+; Entry #31 - ZIP 1.9/UNZIP 5.0, using the -l listing format.
 ; (the -v long format can sometimes result in the old length field
 ; being crammed together with the Method field, resulting in an
@@ -852 +876 @@
 3,1,0,0
 ;
-; Entry #31 - Zoo 2.1.
+; Entry #32 - Zoo 2.1.
 ; NOTE:  Bug in Zoo 2.1 seems to cause files stored with paths to
 ; be extracted with paths even when you don't ask it to do so...
@@ -880 +904 @@
 ;----------------- Older, less used archivers --------------
 ;
-; Entry #32 - ARC 5.12mpl.
+; Entry #33 - ARC 5.12mpl.
 ;
 Arc 5.12mpl
@@ -904 +928 @@
 0,0,0,0
 ;
-; Entry #33 - ARC2 (6.0).
+; Entry #34 - ARC2 (6.0).
 ; Note that I don't actually have a copy of this...
 ;
@@ -929 +953 @@
 0,0,0,0
 ;
-; Entry #34 - ARC2 (6.0) using ARC2 executable.
+; Entry #35 - ARC2 (6.0) using ARC2 executable.
 ;
 Arc 6.0
@@ -953 +977 @@
 0,0,0,0
 ;
-; Entry #35 (CABExtract 1.0)
+; Entry #36 (CABExtract 1.0)
 ;
 CABExtract 1.0
@@ -977 +1001 @@
 5,1,0,0
 ;
-; Entry #36 (Untgz Ver 0.95)
+; Entry #37 (Untgz Ver 0.95)
 ; Supplied by Gregg Young
 ;

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