3.03 fixes to zips

git-svn-id: svn://192.168.1.10/public/Emutil@22898 0d6f1817-ed0e-0410-87c9-987e46238f29

Author: bozimmerman

README

@@ -89,10 +89,12 @@ OPTIONS:
   -R recursive search inside DNP
   -A X approx matching min X% (slower)
   -V verbose
-  -Q suppress parse errors
   -P X verbose on disks with X percent matches
   -C use memory cache of all comparison files
   -D X Recursive depth X
+  -Q Suppress parsing errors
+  -En X exclude files matching mask 'X' in path 'n'
+  -N No sorting of source filenames
 
 -----------------------------------------------------------------------------
 D64Mod

bin/CMDHDParser.jar

@@ -79,6 +79,9 @@ public synchronized byte[][][] getDiskBytes()
 			this.cpmOs = CPMType.NOT;
 			diskBytes = this.getDisk(F, imageFLen);
 			length = imageFLen[0];
+			if((type == ImageType.LNX)
+			||(type == ImageType.T64))
+				return diskBytes;
 			if(length <= 0)
 				length = 174848;
 			// now, attempt to identify CP/M disks.
@@ -1435,8 +1438,6 @@ private List<FileInfo> getCPMFiles(final BitSet parseFlags)
 	public List<FileInfo> getFiles(final BitSet parseFlags)
 	{
 		final String imgName = F.getName();
-		final byte[][][] tsmap = this.getDiskBytes();
-		final int fileSize = getLength();
 		if(type == ImageType.T64)
 			return getTapeFiles(imgName,parseFlags);
 		else
@@ -1453,8 +1454,12 @@ public List<FileInfo> getFiles(final BitSet parseFlags)
 			}
 		}
 		else
-		if(cpmOs != CPMType.NOT)
-			return getCPMFiles(parseFlags);
+		{
+			if(cpmOs != CPMType.NOT)
+				return getCPMFiles(parseFlags);
+		}
+		final byte[][][] tsmap = this.getDiskBytes();
+		final int fileSize = getLength();
 		int t=type.dirHead.track;
 		final int maxT=type.numTracks( fileSize);
 		int s=type.dirHead.sector;
@@ -1590,7 +1595,7 @@ private static String getNextLYNXLineFromInputStream(final InputStream in, final
 	private List<FileInfo> getLNXDeepContents(final String imgName, final BitSet parseFlags) throws IOException
 	{
 		final List<FileInfo> list = new ArrayList<FileInfo>();
-		final byte[] data = getDiskBytes()[0][0];
+		final byte[] data = this.getFlatBytes();
 		final InputStream in = new ByteArrayInputStream(data);
 		final int[] bytesSoFar=new int[1];
 		int zeroes=0;

bin/D64Compare.jar

@@ -32,7 +32,7 @@
 */
 public class D64Base
 {
-	final static String EMUTIL_VERSION = "3.02";
+	final static String EMUTIL_VERSION = "3.03";
 	final static String EMUTIL_AUTHOR = "2024 Bo Zimmerman";
 
 	final static String spaces="                                                        "

bin/D64Duplifind.jar

@@ -191,9 +191,12 @@ public static List<File> getAllFiles(final File baseF, final Pattern P, final in
 	public static List<FileInfo> getFileList(final File F, final boolean normalizeForCompare, final BitSet parseFlags)
 	{
 		List<FileInfo> fileData = null;
-		final CBMDiskImage disk = new CBMDiskImage(F);
-		if(disk.getType() != null)
+		final CBMDiskImage.ImageType type = CBMDiskImage.getImageTypeAndGZipped(F);
+		if(type != null)
+		{
+			final CBMDiskImage disk = new CBMDiskImage(F);
 			fileData=disk.getFiles(parseFlags);
+		}
 		else
 		if(getLooseImageTypeAndGZipped(F) != null)
 		{
@@ -329,7 +332,7 @@ public static void main(final String[] args)
 			System.out.println("  -C use memory cache of all comparison files");
 			System.out.println("  -D X Recursive depth X");
 			System.out.println("  -Q Suppress parsing errors");
-			System.out.println("  -E X exclude files matching mask 'X'");
+			System.out.println("  -En X exclude files matching mask 'X' in path 'n'");
 			System.out.println("  -N No sorting of source filenames");
 			System.out.println("");
 			return;
@@ -342,7 +345,8 @@ public static void main(final String[] args)
 		int deeper = -1;
 		double pct=100.0;
 		final BitSet parseFlags = new BitSet();
-		final List<Pattern> excludeMasks = new LinkedList<Pattern>();
+		final List<Pattern> excludeMasks1 = new LinkedList<Pattern>();
+		final List<Pattern> excludeMasks2 = new LinkedList<Pattern>();
 		for(int i=0;i<args.length;i++)
 		{
 			final int argLen = args[i].length();
@@ -377,8 +381,14 @@ public static void main(final String[] args)
 					case 'E':
 						if(i<args.length-1)
 						{
+							List<Pattern> which = excludeMasks2;
+							if(c<args[i].length()-1)
+							{
+								if(args[i].charAt(c+1)=='1')
+									which = excludeMasks1;
+							}
 							final Pattern P=Pattern.compile(args[i+1]);
-							excludeMasks.add(P);
+							which.add(P);
 							i++;
 							c=argLen;
 						}
@@ -430,8 +440,8 @@ public static void main(final String[] args)
 		List<File> F1s=new ArrayList<File>(1);
 		List<File> F2s=new ArrayList<File>(1);
 		try {
-			F1s = getAllFiles(path,depth,excludeMasks);
-			F2s = getAllFiles(expr,depth,excludeMasks);
+			F1s = getAllFiles(path,depth,excludeMasks1);
+			F2s = getAllFiles(expr,depth,excludeMasks2);
 		} catch (final IOException e) {
 			System.err.println(e.getMessage());
 			System.exit(-1);