Finally check in Jack's latest version, which fixes all known bugs.

Lib/binhex.py

@@ -26,10 +26,6 @@ import struct
 import string
 import binascii
 	
-DEBUG=0
-if DEBUG:
-	testf=open('@binhex.dbg.out', 'w')
-	
 Error = 'binhex.Error'
 
 # States (what have we written)
@@ -37,8 +33,7 @@ Error = 'binhex.Error'
 
 # Various constants
 REASONABLY_LARGE=32768	# Minimal amount we pass the rle-coder
-LINELEN=48		# What we pass to hqx-coder at once
-			# *NOTE* Must be divisible by 3!
+LINELEN=64
 RUNCHAR=chr(0x90)	# run-length introducer
 
 #
@@ -50,6 +45,12 @@ if struct.pack('i', 0177) != '\0\0\0\177':
 # Workarounds for non-mac machines.
 if os.name == 'mac':
 	import macfs
+	import MacOS
+	try:
+		openrf = MacOS.openrf
+	except AttributeError:
+		# Backward compatability
+		openrf = open
 	
 	def FInfo():
 		return macfs.FInfo()
@@ -61,18 +62,17 @@ if os.name == 'mac':
 		fp = open(name, 'rb')
 		fp.seek(0, 2)
 		dlen = fp.tell()
-		fp = open(name, '*rb')
+		fp = openrf(name, '*rb')
 		fp.seek(0, 2)
 		rlen = fp.tell()
 		return file, finfo, dlen, rlen
 	
 	def openrsrc(name, *mode):
-		if mode:
-		    mode = mode[0]
+		if not mode:
+			mode = '*rb'
 		else:
-		    mode = 'rb'
-		mode = '*' + mode
-		return open(name, mode)
+			mode = '*' + mode[0]
+		return openrf(name, mode)
 
 else:
 	#
@@ -122,19 +122,31 @@ class _Hqxcoderengine:
 	def __init__(self, ofp):
 		self.ofp = ofp
 		self.data = ''
+		self.hqxdata = ''
+		self.linelen = LINELEN-1
 
 	def write(self, data):
 		self.data = self.data + data
-		while len(self.data) > LINELEN:
-		    hqxdata = binascii.b2a_hqx(self.data[:LINELEN])
-		    self.ofp.write(hqxdata+'\n')
-		    self.data = self.data[LINELEN:]
+		datalen = len(self.data)
+		todo = (datalen/3)*3
+		data = self.data[:todo]
+		self.data = self.data[todo:]
+		self.hqxdata = self.hqxdata + binascii.b2a_hqx(data)
+		while len(self.hqxdata) > self.linelen:
+			self.ofp.write(self.hqxdata[:self.linelen]+'\n')
+			self.hqxdata = self.hqxdata[self.linelen:]
+			self.linelen = LINELEN
 
 	def close(self):
 		if self.data:
-		    self.ofp.write(binascii.b2a_hqx(self.data))
+			self.hqxdata = self.hqxdata + binascii.b2a_hqx(self.data)
+		while self.hqxdata:
+			self.ofp.write(self.hqxdata[:self.linelen])
+			self.hqxdata = self.hqxdata[self.linelen:]
+			self.linelen = LINELEN
 		self.ofp.write(':\n')
 		self.ofp.close()
+		del self.ofp
 
 class _Rlecoderengine:
 	"""Write data to the RLE-coder in suitably large chunks"""
@@ -144,8 +156,6 @@ class _Rlecoderengine:
 		self.data = ''
 
 	def write(self, data):
-		if DEBUG:
-			testf.write(data) # XXXX
 		self.data = self.data + data
 		if len(self.data) < REASONABLY_LARGE:
 			return
@@ -158,6 +168,7 @@ class _Rlecoderengine:
 			rledata = binascii.rlecode_hqx(self.data)
 			self.ofp.write(rledata)
 		self.ofp.close()
+		del self.ofp
 
 class BinHex:
 	def __init__(self, (name, finfo, dlen, rlen), ofp):
@@ -167,7 +178,7 @@ class BinHex:
 			if os.name == 'mac':
 				fss = macfs.FSSpec(ofname)
 				fss.SetCreatorType('BnHq', 'TEXT')
-		ofp.write('(This file may be decompressed with BinHex 4.0)\n\n:')
+		ofp.write('(This file must be converted with BinHex 4.0)\n\n:')
 		hqxer = _Hqxcoderengine(ofp)
 		self.ofp = _Rlecoderengine(hqxer)
 		self.crc = 0
@@ -179,8 +190,6 @@ class BinHex:
 		self.state = _DID_HEADER
 
 	def _writeinfo(self, name, finfo):
-		if DEBUG:
-			print 'binhex info:', name, finfo.Type, finfo.Creator, self.dlen, self.rlen
 		name = name
 		nl = len(name)
 		if nl > 63:
@@ -232,6 +241,7 @@ class BinHex:
 		self._writecrc()
 		self.ofp.close()
 		self.state = None
+		del self.ofp
 	
 def binhex(inp, out):
 	"""(infilename, outfilename) - Create binhex-encoded copy of a file"""
@@ -240,13 +250,17 @@ def binhex(inp, out):
 	
 	ifp = open(inp, 'rb')
 	# XXXX Do textfile translation on non-mac systems
-	d = ifp.read()
+	while 1:
+		d = ifp.read(128000)
+		if not d: break
 		ofp.write(d)
 	ofp.close_data()
 	ifp.close()
 
 	ifp = openrsrc(inp, 'rb')
-	d = ifp.read()
+	while 1:
+		d = ifp.read(128000)
+		if not d: break
 		ofp.write_rsrc(d)
 	ofp.close()
 	ifp.close() 
@@ -307,7 +321,6 @@ class _Rledecoderengine:
 			self._fill(wtd-len(self.post_buffer))
 		rv = self.post_buffer[:wtd]
 		self.post_buffer = self.post_buffer[wtd:]
-		print 'WTD', wtd, 'GOT', len(rv)
 		return rv
 
 	def _fill(self, wtd):
@@ -354,8 +367,6 @@ class HexBin:
 				break
 			if ch != '\n':
 				dummy = ifp.readline()
-				if DEBUG:
-					print 'SKIP:', ch+dummy
 			
 		hqxifp = _Hqxdecoderengine(ifp)
 		self.ifp = _Rledecoderengine(hqxifp)
@@ -371,8 +382,6 @@ class HexBin:
 		filecrc = struct.unpack('h', self.ifp.read(2))[0] & 0xffff
 ##		self.crc = binascii.crc_hqx('\0\0', self.crc) # XXXX Is this needed??
 		self.crc = self.crc & 0xffff
-		if DEBUG:
-			print 'DBG CRC %x %x'%(self.crc, filecrc)
 		if filecrc != self.crc:
 			raise Error, 'CRC error, computed %x, read %x'%(self.crc, filecrc)
 		self.crc = 0
@@ -389,9 +398,6 @@ class HexBin:
 		self.dlen = struct.unpack('l', rest[11:15])[0]
 		self.rlen = struct.unpack('l', rest[15:19])[0]
 		
-		if DEBUG:
-			print 'DATA, RLEN', self.dlen, self.rlen
-		
 		self.FName = fname
 		self.FInfo = FInfo()
 		self.FInfo.Creator = creator
@@ -451,15 +457,21 @@ def hexbin(inp, out):
 
 	ofp = open(out, 'wb')
 	# XXXX Do translation on non-mac systems
-	d = ifp.read()
+	while 1:
+		d = ifp.read(128000)
+		if not d: break
 		ofp.write(d)
 	ofp.close()
 	ifp.close_data()
 	
-	d = ifp.read_rsrc()
+	d = ifp.read_rsrc(128000)
 	if d:
 		ofp = openrsrc(out, 'wb')
 		ofp.write(d)
+		while 1:
+			d = ifp.read_rsrc(128000)
+			if not d: break
+			ofp.write(d)
 		ofp.close()
 
 	if os.name == 'mac':
@@ -486,4 +498,3 @@ def _test():
 	
 if __name__ == '__main__':
 	_test()
-