@@ -6120,7 +6120,7 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
61206120 data_types = {0 , 7 }
61216121 sparse_types = {12 }
61226122 if ftype in zero_length_types :
6123- fsize = format (int ("0" ), 'x' ).lower ()
6123+ fsize = format (int (0 ), 'x' ).lower ()
61246124 elif ftype in data_types :
61256125 fsize = format (int (fstatinfo .st_size ), 'x' ).lower ()
61266126 else :
@@ -6429,7 +6429,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64296429 curfid = curfid + 1
64306430 if (ftype == 2 ):
64316431 flinkname = member .linkname
6432- fdev = format (int ("0" ), 'x' ).lower ()
6432+ fdev = format (int (0 ), 'x' ).lower ()
64336433 try :
64346434 frdev = format (int (os .makedev (member .devmajor , member .devminor )), 'x' ).lower ()
64356435 except AttributeError :
@@ -6440,7 +6440,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64406440 data_types = {0 , 7 }
64416441 sparse_types = {12 }
64426442 if ftype in zero_length_types :
6443- fsize = format (int ("0" ), 'x' ).lower ()
6443+ fsize = format (int (0 ), 'x' ).lower ()
64446444 elif ftype in data_types :
64456445 fsize = format (int (member .size ), 'x' ).lower ()
64466446 else :
@@ -6733,17 +6733,20 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, extradata=[], jsondata={}
67336733 curfid = curfid + 1
67346734 if (ftype == 2 ):
67356735 flinkname = member .linkpath
6736- fdev = format (int ("0" ), 'x' ).lower ()
6737- frdev = format (int (member .rdev ), 'x' ).lower ()
6736+ fdev = format (int (0 ), 'x' ).lower ()
6737+ if (hasattr (member , "rdev" )):
6738+ frdev = format (int (member .rdev ), 'x' ).lower ()
6739+ else :
6740+ frdev = format (int (0 ), 'x' ).lower ()
67386741 # Types that should be considered zero-length in the archive context:
67396742 zero_length_types = {1 , 2 , 3 , 4 , 5 , 6 , 8 , 9 , 10 , 11 , 13 }
67406743 # Types that have actual data to read:
67416744 data_types = {0 , 7 }
67426745 sparse_types = {12 }
67436746 if ftype in zero_length_types :
6744- fsize = format (int ("0" ), 'x' ).lower ()
6747+ fsize = format (int (0 ), 'x' ).lower ()
67456748 elif member .size is None :
6746- fsize = format (int ("0" ), 'x' ).lower ()
6749+ fsize = format (int (0 ), 'x' ).lower ()
67476750 elif ftype in data_types :
67486751 fsize = format (int (member .size ), 'x' ).lower ()
67496752 else :
@@ -6933,7 +6936,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
69336936 fdev = format (int (0 ), 'x' ).lower ()
69346937 frdev = format (int (0 ), 'x' ).lower ()
69356938 if (ftype == 5 ):
6936- fsize = format (int ("0" ), 'x' ).lower ()
6939+ fsize = format (int (0 ), 'x' ).lower ()
69376940 elif (ftype == 0 ):
69386941 fsize = format (int (member .file_size ), 'x' ).lower ()
69396942 else :
@@ -7196,7 +7199,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
71967199 fdev = format (int (0 ), 'x' ).lower ()
71977200 frdev = format (int (0 ), 'x' ).lower ()
71987201 if (ftype == 5 ):
7199- fsize = format (int ("0" ), 'x' ).lower ()
7202+ fsize = format (int (0 ), 'x' ).lower ()
72007203 elif (ftype == 0 ):
72017204 fsize = format (int (member .file_size ), 'x' ).lower ()
72027205 else :
@@ -7454,7 +7457,7 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
74547457 fdev = format (int (0 ), 'x' ).lower ()
74557458 frdev = format (int (0 ), 'x' ).lower ()
74567459 if (ftype == 5 ):
7457- fsize = format (int ("0" ), 'x' ).lower ()
7460+ fsize = format (int (0 ), 'x' ).lower ()
74587461 fatime = format (int (to_ns (member .creationtime .timestamp ())), 'x' ).lower ()
74597462 fmtime = format (int (to_ns (member .creationtime .timestamp ())), 'x' ).lower ()
74607463 fctime = format (int (to_ns (member .creationtime .timestamp ())), 'x' ).lower ()
@@ -10402,7 +10405,7 @@ def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1040210405 for fmodval in str (oct (fmode ))[- 3 :]:
1040310406 permissionstr = permissionstr + \
1040410407 permissions ['access' ].get (fmodval , '---' )
10405- fsize = int ("0" )
10408+ fsize = int (0 )
1040610409 if (not member .is_directory ):
1040710410 ftype = 0
1040810411 permissionstr = "-" + permissionstr
0 commit comments