Import from dmg2img-1.6.5.tar.gz

(removed execute bits from extracted files)

1.6.5  23 July 2013
  * Fixed a bug in handling some types of dmg files

http://vu1tur.eu.org/tools/dmg2img-1.6.5.tar.gz
bytes   23442
mtime   Tue, 23 Jul 2013 12:12:55 +0000
md5     d01b01151759dd25e16d0c37d4a57b3c
sha1    87db4a19badfde40d007a76092454b0942df2bf4
sha256  400a16cbe5cb2bf8a9eec4a43ef3546e0329f248bbd2a79f6d9a1ebc0b503308

Signed-off-by: Peter Wu <peter@lekensteyn.nl>

README

@@ -109,5 +109,7 @@ CHANGELOG:
 1.6.4  25 April 2012
         * Compilation bugfix (Linux)
 
+1.6.5  23 July 2013
+        * Fixed a bug in handling some types of dmg files
 
 http://vu1tur.eu.org/dmg2img

dmg2img.c

@@ -16,7 +16,7 @@
  */
 
 #define _FILE_OFFSET_BITS 64
-#define VERSION "dmg2img v1.6.4 (c) vu1tur (to@vu1tur.eu.org)"
+#define VERSION "dmg2img v1.6.5 (c) vu1tur (to@vu1tur.eu.org)"
 #define USAGE "\
 Usage: dmg2img [-l] [-p N] [-s] [-v] [-V] [-d] <input.dmg> [<output.img>]\n\
 or     dmg2img [-l] [-p N] [-s] [-v] [-V] [-d] -i <input.dmg> -o <output.img>\n\n\
@@ -600,9 +600,9 @@ int main(int argc, char *argv[])
 			} else if (block_type == BT_TERM) {
 				if (in_offs == 0 && partnum > i+1) {
 					if (convert_char8((unsigned char *)parts[i+1].Data + 24) != 0)
-						in_offs_add = 0;
+						in_offs_add = kolyblk.DataForkOffset;
 				} else
-					in_offs_add = 0;
+					in_offs_add = kolyblk.DataForkOffset;
 
 				if (verbose >= 3)
 					printf("terminator\n");