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

This commit is contained in:
Guido van Rossum 1996-03-23 19:19:04 +00:00
parent 4669d7e415
commit a220e67a9e

View file

@ -25,10 +25,6 @@ import os
import struct import struct
import string import string
import binascii import binascii
DEBUG=0
if DEBUG:
testf=open('@binhex.dbg.out', 'w')
Error = 'binhex.Error' Error = 'binhex.Error'
@ -37,65 +33,69 @@ Error = 'binhex.Error'
# Various constants # Various constants
REASONABLY_LARGE=32768 # Minimal amount we pass the rle-coder REASONABLY_LARGE=32768 # Minimal amount we pass the rle-coder
LINELEN=48 # What we pass to hqx-coder at once LINELEN=64
# *NOTE* Must be divisible by 3!
RUNCHAR=chr(0x90) # run-length introducer RUNCHAR=chr(0x90) # run-length introducer
# #
# The code is currently byte-order dependent # The code is currently byte-order dependent
if struct.pack('i', 0177) != '\0\0\0\177': if struct.pack('i', 0177) != '\0\0\0\177':
raise ImportError, 'Module binhex is big-endian only' raise ImportError, 'Module binhex is big-endian only'
# #
# Workarounds for non-mac machines. # Workarounds for non-mac machines.
if os.name == 'mac': if os.name == 'mac':
import macfs import macfs
import MacOS
def FInfo(): try:
openrf = MacOS.openrf
except AttributeError:
# Backward compatability
openrf = open
def FInfo():
return macfs.FInfo() return macfs.FInfo()
def getfileinfo(name): def getfileinfo(name):
finfo = macfs.FSSpec(name).GetFInfo() finfo = macfs.FSSpec(name).GetFInfo()
dir, file = os.path.split(name) dir, file = os.path.split(name)
# XXXX Get resource/data sizes # XXXX Get resource/data sizes
fp = open(name, 'rb') fp = open(name, 'rb')
fp.seek(0, 2) fp.seek(0, 2)
dlen = fp.tell() dlen = fp.tell()
fp = open(name, '*rb') fp = openrf(name, '*rb')
fp.seek(0, 2) fp.seek(0, 2)
rlen = fp.tell() rlen = fp.tell()
return file, finfo, dlen, rlen return file, finfo, dlen, rlen
def openrsrc(name, *mode): def openrsrc(name, *mode):
if mode: if not mode:
mode = mode[0] mode = '*rb'
else: else:
mode = 'rb' mode = '*' + mode[0]
mode = '*' + mode return openrf(name, mode)
return open(name, mode)
else: else:
# #
# Glue code for non-macintosh useage # Glue code for non-macintosh useage
# #
import regsub import regsub
class FInfo: class FInfo:
def __init__(self): def __init__(self):
self.Type = '????' self.Type = '????'
self.Creator = '????' self.Creator = '????'
self.Flags = 0 self.Flags = 0
def getfileinfo(name): def getfileinfo(name):
finfo = FInfo() finfo = FInfo()
# Quick check for textfile # Quick check for textfile
fp = open(name) fp = open(name)
data = open(name).read(256) data = open(name).read(256)
for c in data: for c in data:
if not c in string.whitespace and (c<' ' or ord(c) > 0177): if not c in string.whitespace and (c<' ' or ord(c) > 0177):
break break
else: else:
finfo.Type = 'TEXT' finfo.Type = 'TEXT'
fp.seek(0, 2) fp.seek(0, 2)
dsize = fp.tell() dsize = fp.tell()
fp.close() fp.close()
@ -103,88 +103,97 @@ else:
file = regsub.sub(':', '-', file) file = regsub.sub(':', '-', file)
return file, finfo, dsize, 0 return file, finfo, dsize, 0
class openrsrc: class openrsrc:
def __init__(self, *args): def __init__(self, *args):
pass pass
def read(self, *args): def read(self, *args):
return '' return ''
def write(self, *args): def write(self, *args):
pass pass
def close(self): def close(self):
pass pass
class _Hqxcoderengine: class _Hqxcoderengine:
"""Write data to the coder in 3-byte chunks""" """Write data to the coder in 3-byte chunks"""
def __init__(self, ofp): def __init__(self, ofp):
self.ofp = ofp self.ofp = ofp
self.data = '' self.data = ''
self.hqxdata = ''
self.linelen = LINELEN-1
def write(self, data): def write(self, data):
self.data = self.data + data self.data = self.data + data
while len(self.data) > LINELEN: datalen = len(self.data)
hqxdata = binascii.b2a_hqx(self.data[:LINELEN]) todo = (datalen/3)*3
self.ofp.write(hqxdata+'\n') data = self.data[:todo]
self.data = self.data[LINELEN:] 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): def close(self):
if self.data: 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.write(':\n')
self.ofp.close() self.ofp.close()
del self.ofp
class _Rlecoderengine: class _Rlecoderengine:
"""Write data to the RLE-coder in suitably large chunks""" """Write data to the RLE-coder in suitably large chunks"""
def __init__(self, ofp): def __init__(self, ofp):
self.ofp = ofp self.ofp = ofp
self.data = '' self.data = ''
def write(self, data): def write(self, data):
if DEBUG:
testf.write(data) # XXXX
self.data = self.data + data self.data = self.data + data
if len(self.data) < REASONABLY_LARGE: if len(self.data) < REASONABLY_LARGE:
return return
rledata = binascii.rlecode_hqx(self.data) rledata = binascii.rlecode_hqx(self.data)
self.ofp.write(rledata) self.ofp.write(rledata)
self.data = '' self.data = ''
def close(self): def close(self):
if self.data: if self.data:
rledata = binascii.rlecode_hqx(self.data) rledata = binascii.rlecode_hqx(self.data)
self.ofp.write(rledata) self.ofp.write(rledata)
self.ofp.close() self.ofp.close()
del self.ofp
class BinHex: class BinHex:
def __init__(self, (name, finfo, dlen, rlen), ofp): def __init__(self, (name, finfo, dlen, rlen), ofp):
if type(ofp) == type(''): if type(ofp) == type(''):
ofname = ofp ofname = ofp
ofp = open(ofname, 'w') ofp = open(ofname, 'w')
if os.name == 'mac': if os.name == 'mac':
fss = macfs.FSSpec(ofname) fss = macfs.FSSpec(ofname)
fss.SetCreatorType('BnHq', 'TEXT') 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) hqxer = _Hqxcoderengine(ofp)
self.ofp = _Rlecoderengine(hqxer) self.ofp = _Rlecoderengine(hqxer)
self.crc = 0 self.crc = 0
if finfo == None: if finfo == None:
finfo = FInfo() finfo = FInfo()
self.dlen = dlen self.dlen = dlen
self.rlen = rlen self.rlen = rlen
self._writeinfo(name, finfo) self._writeinfo(name, finfo)
self.state = _DID_HEADER self.state = _DID_HEADER
def _writeinfo(self, name, finfo): def _writeinfo(self, name, finfo):
if DEBUG:
print 'binhex info:', name, finfo.Type, finfo.Creator, self.dlen, self.rlen
name = name name = name
nl = len(name) nl = len(name)
if nl > 63: if nl > 63:
raise Error, 'Filename too long' raise Error, 'Filename too long'
d = chr(nl) + name + '\0' d = chr(nl) + name + '\0'
d2 = finfo.Type + finfo.Creator d2 = finfo.Type + finfo.Creator
d3 = struct.pack('h', finfo.Flags) d3 = struct.pack('h', finfo.Flags)
@ -193,45 +202,46 @@ class BinHex:
self._write(info) self._write(info)
self._writecrc() self._writecrc()
def _write(self, data): def _write(self, data):
self.crc = binascii.crc_hqx(data, self.crc) self.crc = binascii.crc_hqx(data, self.crc)
self.ofp.write(data) self.ofp.write(data)
def _writecrc(self): def _writecrc(self):
## self.crc = binascii.crc_hqx('\0\0', self.crc) # XXXX Should this be here?? ## self.crc = binascii.crc_hqx('\0\0', self.crc) # XXXX Should this be here??
self.ofp.write(struct.pack('h', self.crc)) self.ofp.write(struct.pack('h', self.crc))
self.crc = 0 self.crc = 0
def write(self, data): def write(self, data):
if self.state != _DID_HEADER: if self.state != _DID_HEADER:
raise Error, 'Writing data at the wrong time' raise Error, 'Writing data at the wrong time'
self.dlen = self.dlen - len(data) self.dlen = self.dlen - len(data)
self._write(data) self._write(data)
def close_data(self): def close_data(self):
if self.dlen <> 0: if self.dlen <> 0:
raise Error, 'Incorrect data size, diff='+`self.rlen` raise Error, 'Incorrect data size, diff='+`self.rlen`
self._writecrc() self._writecrc()
self.state = _DID_DATA self.state = _DID_DATA
def write_rsrc(self, data): def write_rsrc(self, data):
if self.state < _DID_DATA: if self.state < _DID_DATA:
self.close_data() self.close_data()
if self.state != _DID_DATA: if self.state != _DID_DATA:
raise Error, 'Writing resource data at the wrong time' raise Error, 'Writing resource data at the wrong time'
self.rlen = self.rlen - len(data) self.rlen = self.rlen - len(data)
self._write(data) self._write(data)
def close(self): def close(self):
if self.state < _DID_DATA: if self.state < _DID_DATA:
self.close_data() self.close_data()
if self.state != _DID_DATA: if self.state != _DID_DATA:
raise Error, 'Close at the wrong time' raise Error, 'Close at the wrong time'
if self.rlen <> 0: if self.rlen <> 0:
raise Error, "Incorrect resource-datasize, diff="+`self.rlen` raise Error, "Incorrect resource-datasize, diff="+`self.rlen`
self._writecrc() self._writecrc()
self.ofp.close() self.ofp.close()
self.state = None self.state = None
del self.ofp
def binhex(inp, out): def binhex(inp, out):
"""(infilename, outfilename) - Create binhex-encoded copy of a file""" """(infilename, outfilename) - Create binhex-encoded copy of a file"""
@ -240,25 +250,29 @@ def binhex(inp, out):
ifp = open(inp, 'rb') ifp = open(inp, 'rb')
# XXXX Do textfile translation on non-mac systems # XXXX Do textfile translation on non-mac systems
d = ifp.read() while 1:
ofp.write(d) d = ifp.read(128000)
if not d: break
ofp.write(d)
ofp.close_data() ofp.close_data()
ifp.close() ifp.close()
ifp = openrsrc(inp, 'rb') ifp = openrsrc(inp, 'rb')
d = ifp.read() while 1:
ofp.write_rsrc(d) d = ifp.read(128000)
if not d: break
ofp.write_rsrc(d)
ofp.close() ofp.close()
ifp.close() ifp.close()
class _Hqxdecoderengine: class _Hqxdecoderengine:
"""Read data via the decoder in 4-byte chunks""" """Read data via the decoder in 4-byte chunks"""
def __init__(self, ifp): def __init__(self, ifp):
self.ifp = ifp self.ifp = ifp
self.eof = 0 self.eof = 0
def read(self, totalwtd): def read(self, totalwtd):
"""Read at least wtd bytes (or until EOF)""" """Read at least wtd bytes (or until EOF)"""
decdata = '' decdata = ''
wtd = totalwtd wtd = totalwtd
@ -290,27 +304,26 @@ class _Hqxdecoderengine:
raise Error, 'Premature EOF on binhex file' raise Error, 'Premature EOF on binhex file'
return decdata return decdata
def close(self): def close(self):
self.ifp.close() self.ifp.close()
class _Rledecoderengine: class _Rledecoderengine:
"""Read data via the RLE-coder""" """Read data via the RLE-coder"""
def __init__(self, ifp): def __init__(self, ifp):
self.ifp = ifp self.ifp = ifp
self.pre_buffer = '' self.pre_buffer = ''
self.post_buffer = '' self.post_buffer = ''
self.eof = 0 self.eof = 0
def read(self, wtd): def read(self, wtd):
if wtd > len(self.post_buffer): if wtd > len(self.post_buffer):
self._fill(wtd-len(self.post_buffer)) self._fill(wtd-len(self.post_buffer))
rv = self.post_buffer[:wtd] rv = self.post_buffer[:wtd]
self.post_buffer = self.post_buffer[wtd:] self.post_buffer = self.post_buffer[wtd:]
print 'WTD', wtd, 'GOT', len(rv)
return rv return rv
def _fill(self, wtd): def _fill(self, wtd):
# #
# Obfuscated code ahead. We keep at least one byte in the pre_buffer, # Obfuscated code ahead. We keep at least one byte in the pre_buffer,
# so we don't stumble over an orphaned RUNCHAR later on. If the # so we don't stumble over an orphaned RUNCHAR later on. If the
@ -336,13 +349,13 @@ class _Rledecoderengine:
binascii.rledecode_hqx(self.pre_buffer[:mark]) binascii.rledecode_hqx(self.pre_buffer[:mark])
self.pre_buffer = self.pre_buffer[mark:] self.pre_buffer = self.pre_buffer[mark:]
def close(self): def close(self):
self.ifp.close() self.ifp.close()
class HexBin: class HexBin:
def __init__(self, ifp): def __init__(self, ifp):
if type(ifp) == type(''): if type(ifp) == type(''):
ifp = open(ifp) ifp = open(ifp)
# #
# Find initial colon. # Find initial colon.
# #
@ -354,30 +367,26 @@ class HexBin:
break break
if ch != '\n': if ch != '\n':
dummy = ifp.readline() dummy = ifp.readline()
if DEBUG:
print 'SKIP:', ch+dummy
hqxifp = _Hqxdecoderengine(ifp) hqxifp = _Hqxdecoderengine(ifp)
self.ifp = _Rledecoderengine(hqxifp) self.ifp = _Rledecoderengine(hqxifp)
self.crc = 0 self.crc = 0
self._readheader() self._readheader()
def _read(self, len): def _read(self, len):
data = self.ifp.read(len) data = self.ifp.read(len)
self.crc = binascii.crc_hqx(data, self.crc) self.crc = binascii.crc_hqx(data, self.crc)
return data return data
def _checkcrc(self): def _checkcrc(self):
filecrc = struct.unpack('h', self.ifp.read(2))[0] & 0xffff 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 = binascii.crc_hqx('\0\0', self.crc) # XXXX Is this needed??
self.crc = self.crc & 0xffff self.crc = self.crc & 0xffff
if DEBUG:
print 'DBG CRC %x %x'%(self.crc, filecrc)
if filecrc != self.crc: if filecrc != self.crc:
raise Error, 'CRC error, computed %x, read %x'%(self.crc, filecrc) raise Error, 'CRC error, computed %x, read %x'%(self.crc, filecrc)
self.crc = 0 self.crc = 0
def _readheader(self): def _readheader(self):
len = self._read(1) len = self._read(1)
fname = self._read(ord(len)) fname = self._read(ord(len))
rest = self._read(1+4+4+2+4+4) rest = self._read(1+4+4+2+4+4)
@ -389,9 +398,6 @@ class HexBin:
self.dlen = struct.unpack('l', rest[11:15])[0] self.dlen = struct.unpack('l', rest[11:15])[0]
self.rlen = struct.unpack('l', rest[15:19])[0] self.rlen = struct.unpack('l', rest[15:19])[0]
if DEBUG:
print 'DATA, RLEN', self.dlen, self.rlen
self.FName = fname self.FName = fname
self.FInfo = FInfo() self.FInfo = FInfo()
self.FInfo.Creator = creator self.FInfo.Creator = creator
@ -400,7 +406,7 @@ class HexBin:
self.state = _DID_HEADER self.state = _DID_HEADER
def read(self, *n): def read(self, *n):
if self.state != _DID_HEADER: if self.state != _DID_HEADER:
raise Error, 'Read data at wrong time' raise Error, 'Read data at wrong time'
if n: if n:
@ -411,33 +417,33 @@ class HexBin:
self.dlen = self.dlen - n self.dlen = self.dlen - n
return self._read(n) return self._read(n)
def close_data(self): def close_data(self):
if self.state != _DID_HEADER: if self.state != _DID_HEADER:
raise Error, 'close_data at wrong time' raise Error, 'close_data at wrong time'
if self.dlen: if self.dlen:
dummy = self._read(self.dlen) dummy = self._read(self.dlen)
self._checkcrc() self._checkcrc()
self.state = _DID_DATA self.state = _DID_DATA
def read_rsrc(self, *n): def read_rsrc(self, *n):
if self.state == _DID_HEADER: if self.state == _DID_HEADER:
self.close_data() self.close_data()
if self.state != _DID_DATA: if self.state != _DID_DATA:
raise Error, 'Read resource data at wrong time' raise Error, 'Read resource data at wrong time'
if n: if n:
n = n[0] n = n[0]
n = min(n, self.rlen) n = min(n, self.rlen)
else: else:
n = self.rlen n = self.rlen
self.rlen = self.rlen - n self.rlen = self.rlen - n
return self._read(n) return self._read(n)
def close(self): def close(self):
if self.rlen: if self.rlen:
dummy = self.read_rsrc(self.rlen) dummy = self.read_rsrc(self.rlen)
self._checkcrc() self._checkcrc()
self.state = _DID_RSRC self.state = _DID_RSRC
self.ifp.close() self.ifp.close()
def hexbin(inp, out): def hexbin(inp, out):
"""(infilename, outfilename) - Decode binhexed file""" """(infilename, outfilename) - Decode binhexed file"""
@ -451,15 +457,21 @@ def hexbin(inp, out):
ofp = open(out, 'wb') ofp = open(out, 'wb')
# XXXX Do translation on non-mac systems # XXXX Do translation on non-mac systems
d = ifp.read() while 1:
ofp.write(d) d = ifp.read(128000)
if not d: break
ofp.write(d)
ofp.close() ofp.close()
ifp.close_data() ifp.close_data()
d = ifp.read_rsrc() d = ifp.read_rsrc(128000)
if d: if d:
ofp = openrsrc(out, 'wb') ofp = openrsrc(out, 'wb')
ofp.write(d) ofp.write(d)
while 1:
d = ifp.read_rsrc(128000)
if not d: break
ofp.write(d)
ofp.close() ofp.close()
if os.name == 'mac': if os.name == 'mac':
@ -486,4 +498,3 @@ def _test():
if __name__ == '__main__': if __name__ == '__main__':
_test() _test()