Changeset 1690 for trunk

Timestamp:

Aug 5, 2013, 2:13:41 AM (12 years ago)

Author:

Gregg Young

Message:

Changes to fix .tar.gz list because of changes in tar 1.20 (maybe earlier). Added lzip support with ungly hack to work around its lack of a list option. Tickets 493, 494

Location:

trunk

Files:

• archiver.tmp (modified) (30 diffs)
• dll/arccnrs.c (modified) (2 diffs)
• dll/defview.c (modified) (1 diff)
• dll/filldir.c (modified) (1 diff)
• dll/fm3res.rc (modified) (1 diff)
• dll/fm3str.h (modified) (1 diff)

trunk/archiver.tmp

@@ -150 +150 @@
 ;
 7z
-7z
+7Z
 0
 7za.exe l
@@ -346 +346 @@
 ; Entry #11 (tar.gz)
 ;
-TAR.GZ (Req. TAR 1.15+ & GZIP)
-tar.gz
+TAR.GZ (Req. TAR 1.20+ & GZIP)
+TAR.GZ
 0
 tar.exe -tzvf
@@ -364 +364 @@
 2
 -1
-3,6
+3,5
+2
+5,1,0,0
+;
+;
+; Entry #12 (tar.gz)
+;
+TAR.GZ (Req. TAR 1.10-15 & GZIP)
+TAR.GZ
+0
+tar.exe -tzvf
+tar.exe -xzpvf
+tar.exe -xzpvf
+
+tar.exe -rzpf
+tar.exe -rpf
+
+
+
+tar.exe -z --delete -f
+\x1f\x8b
+None
+None
+2
+-1
+3,5
 4
 7,1,0,0
 ;
-; Entry #12 (tar.bz2)
+; Entry #13 (tar.bz2)
 ;
 TAR.BZ2 (Req. TAR 1.15+ & BZIP2)
@@ -392 +417 @@
 5,1,0,0
 ;
-; Entry #13 - GZIP (GZ).
+; Entry #14 - GZIP (GZ).
 ;
 GZIP (GZ) (req. GZIP & TAR 1.15+)
@@ -398 +423 @@
 0
 gzip.exe -lv
-gzipe.cmd
+gzip.exe -d
 
 gzip.exe -t
@@ -416 +441 @@
 5,1,0,0
 ;
-; Entry #14 - GZIP (Z).
+; Entry #15 - GZIP (Z).
 ;
 GZIP (Z)
@@ -422 +447 @@
 0
 gzip.exe -lv
-gzipe.cmd
+gzip.exe -d
 
 gzip.exe -t
@@ -440 +465 @@
 8,0,0,0
 ;
-; Entry #15 - Unarj 2.30 demo version.
+; Entry #16 (Lzip)
+;
+Lzip
+lz
+0
+lzip.exe
+lzip.EXE -d
+lzip.EXE -d
+lzip.EXE -tvvv
+Lzip.EXE -k
+
+
+Lzip.EXE
+
+
+LZIP
+None
+None
+-1
+-1
+-1,0
+-1
+-1,0,0,0
+;
+; Entry #17 - Unarj 2.30 demo version.
 ; Don't use Unarj 2.41; it's broken.
 ;
@@ -465 +514 @@
 0,0,0,0
 ;
-; Entry #16 - Arj 2.00 (DOS).
+; Entry #18 - 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
@@ -493 +542 @@
 0,0,0,0
 ;
-; Entry #17 (RAR v.3.5)
+; Entry #19 (RAR v.3.5)
 ;
 RAR v.3.5
@@ -517 +566 @@
 0,0,0,1
 ;
-; Entry #18 - RAR/2 v2, provided by Eugene Roshal.
+; Entry #20 - RAR/2 v2, provided by Eugene Roshal.
 ;
 RAR/2 v2
@@ -541 +590 @@
 0,0,0,1
 ;
-; Entry #19 - RAR/2 v.1.53beta OS/2 SFX.
+; Entry #21 - RAR/2 v.1.53beta OS/2 SFX.
 ;
 RAR/2 v.1.53beta OS/2 SFX
@@ -565 +614 @@
 0,0,0,1
 ;
-; Entry #20 - RAR v.1.53 DOS SFX.
+; Entry #22 - RAR v.1.53 DOS SFX.
 ;
 RAR v.1.53 DOS SFX
@@ -589 +638 @@
 0,0,0,1
 ;
-; Entry #21 - RAR v.2.00 SFX.
+; Entry #23 - RAR v.2.00 SFX.
 ;
 RAR v.2.00 SFX
@@ -614 +663 @@
 ;
 ;
-; Entry #22 - LHarc 2.22.
+; Entry #24 - LHarc 2.22.
 ; Supposedly fixes bugs in earlier versions.
 ; Actually seems to have done so.  Good work, Peter.
@@ -640 +689 @@
 2,1,0,0
 ;
-; Entry #23 - LHarc 2.22 using LH32 executable.
+; Entry #25 - LHarc 2.22 using LH32 executable.
 ;
 LHarc-32 2.22
@@ -664 +713 @@
 2,1,0,0
 ;
-; Entry #24 - LHarc 2.22 self-extractors..
+; Entry #26 - LHarc 2.22 self-extractors..
 ;
 LHarc 2.22 SE
@@ -688 +737 @@
 2,1,0,0
 ;
-; Entry #25 - LHA 2.12 (DOS) self-extractors.
+; Entry #27 - LHA 2.12 (DOS) self-extractors.
 ; LH 2.22 seems to recognize them
 ;
@@ -713 +762 @@
 2,1,0,0
 ;
-; Entry #26 - LHA 2.12 (DOS) self-extractors.
+; Entry #28 - LHA 2.12 (DOS) self-extractors.
 ; LH 2.22 seems to recognize them
 ;
@@ -738 +787 @@
 2,1,0,0
 ;
-; Entry #27 - LHA 2.13L (DOS) self-extractors.
+; Entry #29 - LHA 2.13L (DOS) self-extractors.
 ; LH 2.22 seems to recognize them
 ;
@@ -763 +812 @@
 2,1,0,0
 ;
-; Entry #28 - LH2 2.11.
+; Entry #30 - 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.
@@ -789 +838 @@
 2,1,0,0
 ;
-; Entry #29 - ZIP 1.9/UNZIP 5.0 (available in 32-bit versions).
+; Entry #31 - 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
@@ -824 +873 @@
 7,1,0,0
 ;
-; Entry #30 - ZIP 1.9/UNZIP 5.0 using *32 executables.
+; Entry #32 - ZIP 1.9/UNZIP 5.0 using *32 executables.
 ;
 Zip/UnZip-32 1.9/5.0
@@ -848 +897 @@
 7,1,0,0
 ;
-; Entry #31 - ZIP 1.9/UNZIP 5.0, using the -l listing format.
+; Entry #33 - 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
@@ -876 +925 @@
 3,1,0,0
 ;
-; Entry #32 - Zoo 2.1.
+; Entry #34 - 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...
@@ -904 +953 @@
 ;----------------- Older, less used archivers --------------
 ;
-; Entry #33 - ARC 5.12mpl.
+; Entry #35 - ARC 5.12mpl.
 ;
 Arc 5.12mpl
@@ -928 +977 @@
 0,0,0,0
 ;
-; Entry #34 - ARC2 (6.0).
+; Entry #36 - ARC2 (6.0).
 ; Note that I don't actually have a copy of this...
 ;
@@ -953 +1002 @@
 0,0,0,0
 ;
-; Entry #35 - ARC2 (6.0) using ARC2 executable.
+; Entry #37 - ARC2 (6.0) using ARC2 executable.
 ;
 Arc 6.0
@@ -977 +1026 @@
 0,0,0,0
 ;
-; Entry #36 (CABExtract 1.0)
+; Entry #38 (CABExtract 1.0)
 ;
 CABExtract 1.0
@@ -1001 +1050 @@
 5,1,0,0
 ;
-; Entry #37 (Untgz Ver 0.95)
+; Entry #39 (Untgz Ver 0.95)
 ; Supplied by Gregg Young
 ;

trunk/dll/arccnrs.c

@@ -885 +885 @@
         numarcfiles = 0;                // Request close
       else if (!numarcfiles || !gotstart
-               || (!gotend && info->endlist && *info->endlist && (stricmp(info->endlist, NO_END_OF_ARCHIVER_LIST_STRING)))) {
+               || (!gotend && info->endlist && *info->endlist &&
+                   (stricmp(info->endlist, NO_END_OF_ARCHIVER_LIST_STRING)))) {
         // Oops
         ARCDUMP ad;
@@ -3599 +3600 @@
   static USHORT idinc = 0;
 
+
+  if (!strcmp(strupr(strrchr(arcname, '.') + 1), "LZ")) {
+      saymsg(MB_ENTER | MB_ICONASTERISK, HWND_DESKTOP, GetPString(IDS_LZIPLIMITATION),
+             GetPString(IDS_LZIPNOLIST));
+    return -1;
+  }
+
   if (!idinc)
     idinc = (rand() % 256);

trunk/dll/defview.c

@@ -302 +302 @@
                            strcmp(realappname, FM3Str)) ?
                           HWND_DESKTOP :
-                          hwndParent, hwndFrame, filename, 4, NULL);
+                          hwndParent, hwndFrame, filename, 4, NULL);
+    if (hwndArc == -1)
+      return;
+
     if (!hwndArc) {
       if (!IsExecutable(filename) || !ExecFile(hwnd, filename)) {

trunk/dll/filldir.c

@@ -324 +324 @@
              cmp == *(ULONG *) ".GZ"  || cmp == *(ULONG *) ".Z"   ||
              cmp == *(ULONG *) ".CAB" || cmp == *(ULONG *) ".BZ2" ||
-             cmp == *(ULONG *) ".WPI")
+             cmp == *(ULONG *) ".WPI" || cmp == *(ULONG *) ".7Z")
       hptr = hptrArc;
     else if (cmp == *(ULONG *) PCSZ_DOTBMP  ||

trunk/dll/fm3res.rc

@@ -3391 +3391 @@
     IDS_SNAPSHOTFILEBADFORMAT             "The snapshot file lists no files or is not formatted correctly"
     IDS_SNAPSHOTFILELOADFAILED            "The snapshot file %s failed to load"
+    IDS_LZIPLIMITATION                    "Lzip Limitation"
+    IDS_LZIPNOLIST                        "Lzip doesn't have a list files option"
+           
     
     

trunk/dll/fm3str.h

@@ -907 +907 @@
 #define IDS_FM2LITETEXT                                       879
 #define IDS_CHANGECMDLINELENGTHDEFAULT                        880
-#define IDS_NODESMAXTEXT                                      882 //Not used
+#define IDS_LZIPLIMITATION                                    881
+#define IDS_LZIPNOLIST                                        882 
 #define IDS_DECRYPT1TEXT                                      883 //Not used
 #define IDS_DECRYPT2TEXT                                      884 //Not used