Skip to content

Commit c4ff177

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent 590fdbe commit c4ff177

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

pycatfile.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3648,7 +3648,7 @@ def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None):
36483648
return outfp
36493649

36503650

3651-
def makedevalt(major, minor):
3651+
def MakeDevAlt(major, minor):
36523652
"""
36533653
Replicates os.makedev functionality to create a device number.
36543654
:param major: Major device number
@@ -4178,7 +4178,7 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
41784178
ftype = 12
41794179
elif(member.isdev()):
41804180
ffullmode = member.mode
4181-
ftype = 7
4181+
ftype = 14
41824182
else:
41834183
ffullmode = member.mode
41844184
ftype = 0
@@ -4191,7 +4191,7 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
41914191
try:
41924192
fdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
41934193
except AttributeError:
4194-
fdev = format(int(makedevalt(member.devmajor, member.devminor)), 'x').lower()
4194+
fdev = format(int(MakeDevAlt(member.devmajor, member.devminor)), 'x').lower()
41954195
fdev_minor = format(int(member.devminor), 'x').lower()
41964196
fdev_major = format(int(member.devmajor), 'x').lower()
41974197
if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
@@ -6724,7 +6724,7 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
67246724
ftype = 12
67256725
elif(member.isdev()):
67266726
ffullmode = member.mode
6727-
ftype = 7
6727+
ftype = 14
67286728
else:
67296729
ffullmode = member.mode
67306730
ftype = 0
@@ -6739,7 +6739,7 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
67396739
try:
67406740
fdev = os.makedev(member.devmajor, member.devminor)
67416741
except AttributeError:
6742-
fdev = makedevalt(member.devmajor, member.devminor)
6742+
fdev = MakeDevAlt(member.devmajor, member.devminor)
67436743
fdev_minor = member.devminor
67446744
fdev_major = member.devmajor
67456745
if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
@@ -8296,9 +8296,6 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
82968296
if(member.isreg()):
82978297
ffullmode = member.mode + stat.S_IFREG
82988298
ftype = 0
8299-
elif(member.isdev()):
8300-
ffullmode = member.mode
8301-
ftype = 7
83028299
elif(member.islnk()):
83038300
ffullmode = member.mode + stat.S_IFREG
83048301
ftype = 1
@@ -8322,7 +8319,7 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
83228319
ftype = 12
83238320
elif(member.isdev()):
83248321
ffullmode = member.mode
8325-
ftype = 7
8322+
ftype = 14
83268323
else:
83278324
ffullmode = member.mode
83288325
ftype = 0

0 commit comments

Comments
 (0)