Skip to content

Commit 0fa3b0c

Browse files
committed
Small update
1 parent 83b32b1 commit 0fa3b0c

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

pycatfile/pyfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ def _wrap(stream):
9090
sys.stderr = _wrap(sys.stderr)
9191

9292
hashlib_guaranteed = False
93+
try:
94+
_ALGORITHMS_AVAILABLE = set(hashlib.algorithms_available)
95+
except AttributeError:
96+
_ALGORITHMS_AVAILABLE = set(getattr(hashlib, "algorithms", []))
9397
# Environment setup
9498
os.environ["PYTHONIOENCODING"] = "UTF-8"
9599

@@ -5968,6 +5972,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
59685972
fcurfid = format(int(curfid), 'x').lower()
59695973
fcurinode = format(int(curfid), 'x').lower()
59705974
curfid = curfid + 1
5975+
flinkcount = format(int(flinkcount), 'x').lower()
59715976
fdev = format(int(0), 'x').lower()
59725977
frdev = format(int(0), 'x').lower()
59735978
if(ftype == 5):
@@ -6001,6 +6006,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
60016006
elif(zipinfo.create_system == 3):
60026007
fwinattributes = format(int(zipinfo.external_attr & 0xFFFF), 'x').lower()
60036008
fmode = format(int((zipinfo.external_attr >> 16) & 0xFFFF), 'x').lower()
6009+
mode = int(zipinfo.external_attr >> 16)
60046010
prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
60056011
if(prefmode==0):
60066012
fmode = 0
@@ -6230,6 +6236,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
62306236
fcurfid = format(int(curfid), 'x').lower()
62316237
fcurinode = format(int(curfid), 'x').lower()
62326238
curfid = curfid + 1
6239+
flinkcount = format(int(flinkcount), 'x').lower()
62336240
fdev = format(int(0), 'x').lower()
62346241
frdev = format(int(0), 'x').lower()
62356242
if(ftype == 5):
@@ -6488,6 +6495,7 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
64886495
fcurfid = format(int(curfid), 'x').lower()
64896496
fcurinode = format(int(curfid), 'x').lower()
64906497
curfid = curfid + 1
6498+
flinkcount = format(int(flinkcount), 'x').lower()
64916499
fdev = format(int(0), 'x').lower()
64926500
frdev = format(int(0), 'x').lower()
64936501
if(ftype == 5):
@@ -9087,6 +9095,7 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
90879095
elif(zipinfo.create_system == 3):
90889096
fwinattributes = int(zipinfo.external_attr & 0xFFFF)
90899097
fmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
9098+
mode = int(zipinfo.external_attr >> 16)
90909099
prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
90919100
if(prefmode==0):
90929101
fmode = 0

0 commit comments

Comments
 (0)