Skip to content

Commit c409ce7

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent 4a536ec commit c409ce7

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

pycatfile.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,7 +2128,7 @@ def ReadFileHeaderDataBySize(fp, delimiter=__file_format_dict__['format_delimite
21282128
if(headersize <= 0):
21292129
return []
21302130
headercontent = str(fp.read(headersize).decode('UTF-8')).split(delimiter)
2131-
fp.seek(1, 1)
2131+
fp.seek(len(delimiter), 1)
21322132
rocount = 0
21332133
roend = int(len(headercontent))
21342134
HeaderOut = preheaderdata
@@ -3029,7 +3029,7 @@ def AppendFileHeader(fp, numfiles, fencoding, extradata=[], checksumtype="crc32"
30293029
fileheader + fnumfilesa, checksumtype, True, formatspecs)
30303030
fnumfilesa = fnumfilesa + \
30313031
AppendNullByte(catfileheadercshex, formatspecs['format_delimiter'])
3032-
catheaersize = format(int(len(fnumfilesa) - 1), 'x').lower()
3032+
catheaersize = format(int(len(fnumfilesa) - len(formatspecs['format_delimiter'])), 'x').lower()
30333033
catheaersizestr = AppendNullByte(catheaersize, formatspecs['format_delimiter'])
30343034
fp.write(catheaersizestr.encode('UTF-8'))
30353035
fp.write(fnumfilesa.encode('UTF-8'))
@@ -3149,7 +3149,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
31493149
tmpfileoutstr = catfileoutstr + \
31503150
AppendNullBytes([catfileheadercshex, catfilecontentcshex],
31513151
formatspecs['format_delimiter'])
3152-
catheaersize = format(int(len(tmpfileoutstr) - 1), 'x').lower()
3152+
catheaersize = format(int(len(tmpfileoutstr) - len(formatspecs['format_delimiter'])), 'x').lower()
31533153
catfileoutstr = AppendNullByte(
31543154
catheaersize, formatspecs['format_delimiter']) + catfileoutstr
31553155
catfileheadercshex = GetFileChecksum(
@@ -7481,7 +7481,7 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
74817481
tmpfileoutstr = catfileoutstr + \
74827482
AppendNullBytes([catfileheadercshex, catfilecontentcshex],
74837483
formatspecs['format_delimiter'])
7484-
catheaersize = format(int(len(tmpfileoutstr) - 1), 'x').lower()
7484+
catheaersize = format(int(len(tmpfileoutstr) - len(formatspecs['format_delimiter'])), 'x').lower()
74857485
catfileoutstr = AppendNullByte(
74867486
catheaersize, formatspecs['format_delimiter']) + catfileoutstr
74877487
catfileheadercshex = GetFileChecksum(
@@ -7723,7 +7723,7 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype=[
77237723
tmpfileoutstr = catfileoutstr + \
77247724
AppendNullBytes([catfileheadercshex, catfilecontentcshex],
77257725
formatspecs['format_delimiter'])
7726-
catheaersize = format(int(len(tmpfileoutstr) - 1), 'x').lower()
7726+
catheaersize = format(int(len(tmpfileoutstr) - len(formatspecs['format_delimiter'])), 'x').lower()
77277727
catfileoutstr = AppendNullByte(
77287728
catheaersize, formatspecs['format_delimiter']) + catfileoutstr
77297729
catfileheadercshex = GetFileChecksum(
@@ -7962,7 +7962,7 @@ def ZipFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype=[
79627962
tmpfileoutstr = catfileoutstr + \
79637963
AppendNullBytes([catfileheadercshex, catfilecontentcshex],
79647964
formatspecs['format_delimiter'])
7965-
catheaersize = format(int(len(tmpfileoutstr) - 1), 'x').lower()
7965+
catheaersize = format(int(len(tmpfileoutstr) - len(formatspecs['format_delimiter'])), 'x').lower()
79667966
catfileoutstr = AppendNullByte(
79677967
catheaersize, formatspecs['format_delimiter']) + catfileoutstr
79687968
catfileheadercshex = GetFileChecksum(
@@ -8211,7 +8211,7 @@ def RarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype=[
82118211
tmpfileoutstr = catfileoutstr + \
82128212
AppendNullBytes(
82138213
[catfileheadercshex, catfilecontentcshex], formatspecs['format_delimiter'])
8214-
catheaersize = format(int(len(tmpfileoutstr) - 1), 'x').lower()
8214+
catheaersize = format(int(len(tmpfileoutstr) - len(formatspecs['format_delimiter'])), 'x').lower()
82158215
catfileoutstr = AppendNullByte(
82168216
catheaersize, formatspecs['format_delimiter']) + catfileoutstr
82178217
catfileheadercshex = GetFileChecksum(
@@ -8406,7 +8406,7 @@ def SevenZipFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumt
84068406
tmpfileoutstr = catfileoutstr + \
84078407
AppendNullBytes(
84088408
[catfileheadercshex, catfilecontentcshex], formatspecs['format_delimiter'])
8409-
catheaersize = format(int(len(tmpfileoutstr) - 1), 'x').lower()
8409+
catheaersize = format(int(len(tmpfileoutstr) - len(formatspecs['format_delimiter'])), 'x').lower()
84108410
catfileoutstr = AppendNullByte(
84118411
catheaersize, formatspecs['format_delimiter']) + catfileoutstr
84128412
catfileheadercshex = GetFileChecksum(

0 commit comments

Comments
 (0)