Skip to content

Commit c0bc231

Browse files
committed
Small update
1 parent fe093d9 commit c0bc231

1 file changed

Lines changed: 43 additions & 3 deletions

File tree

pyfoxfile/pyfoxfile.py

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6714,13 +6714,21 @@ def AppendFilesWithContentToList(infiles, fmttype="auto", dirlistfromtxt=False,
67146714
if(not os.path.exists(fname)):
67156715
return False
67166716
try:
6717-
fdev = fstatinfo.st_rdev
6717+
fdev = fstatinfo.st_dev
6718+
fdev_major = os.major(fdev)
6719+
fdev_minor = os.minor(fdev)
67186720
except AttributeError:
6719-
fdev = format(int(0), 'x').lower()
6721+
fdev = 0
6722+
fdev_major = 0
6723+
fdev_minor = 0
67206724
try:
67216725
frdev = fstatinfo.st_rdev
6726+
frdev_major = os.major(frdev)
6727+
frdev_minor = os.minor(frdev)
67226728
except AttributeError:
6723-
frdev = format(int(0), 'x').lower()
6729+
frdev = 0
6730+
frdev_major = 0
6731+
frdev_minor = 0
67246732
# Types that should be considered zero-length in the archive context:
67256733
zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
67266734
# Types that have actual data to read:
@@ -6780,7 +6788,11 @@ def AppendFilesWithContentToList(infiles, fmttype="auto", dirlistfromtxt=False,
67806788
except ImportError:
67816789
fgname = ""
67826790
fdev = format(int(fdev), 'x').lower()
6791+
fdev_major = format(int(fdev_major), 'x').lower()
6792+
fdev_minor = format(int(fdev_minor), 'x').lower()
67836793
frdev = format(int(frdev), 'x').lower()
6794+
frdev_major = format(int(frdev_major), 'x').lower()
6795+
frdev_minor = format(int(frdev_minor), 'x').lower()
67846796
finode = format(int(finode), 'x').lower()
67856797
flinkcount = format(int(flinkcount), 'x').lower()
67866798
if(hasattr(fstatinfo, "st_file_attributes")):
@@ -7042,10 +7054,16 @@ def AppendFilesWithContentFromTarFileToList(infile, fmttype="auto", extradata=[]
70427054
if(ftype == 2):
70437055
flinkname = member.linkname
70447056
fdev = format(int(0), 'x').lower()
7057+
fdev_major = format(int(0), 'x').lower()
7058+
fdev_minor = format(int(0), 'x').lower()
70457059
try:
70467060
frdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
7061+
frdev_major = format(int(member.devmajor), 'x').lower()
7062+
frdev_minor = format(int(member.devminor), 'x').lower()
70477063
except AttributeError:
70487064
frdev = format(int(MakeDevAlt(member.devmajor, member.devminor)), 'x').lower()
7065+
frdev_major = format(int(member.devmajor), 'x').lower()
7066+
frdev_minor = format(int(member.devminor), 'x').lower()
70497067
# Types that should be considered zero-length in the archive context:
70507068
zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
70517069
# Types that have actual data to read:
@@ -7330,10 +7348,20 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, fmttype="auto", extradata
73307348
if(ftype == 2):
73317349
flinkname = member.linkpath
73327350
fdev = format(int(0), 'x').lower()
7351+
fdev_major = format(int(0), 'x').lower()
7352+
fdev_minor = format(int(0), 'x').lower()
73337353
if(hasattr(member, "rdev")):
73347354
frdev = format(int(member.rdev), 'x').lower()
73357355
else:
73367356
frdev = format(int(0), 'x').lower()
7357+
if(hasattr(member, "rdevmajor")):
7358+
frdev_major = format(int(member.rdevmajor), 'x').lower()
7359+
else:
7360+
frdev_major = format(int(0), 'x').lower()
7361+
if(hasattr(member, "rdevminor")):
7362+
frdev_minor = format(int(member.rdevminor), 'x').lower()
7363+
else:
7364+
frdev_minor = format(int(0), 'x').lower()
73377365
# Types that should be considered zero-length in the archive context:
73387366
zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
73397367
# Types that have actual data to read:
@@ -7526,7 +7554,11 @@ def AppendFilesWithContentFromZipFileToList(infile, fmttype="auto", extradata=[]
75267554
curfid = curfid + 1
75277555
flinkcount = format(int(flinkcount), 'x').lower()
75287556
fdev = format(int(0), 'x').lower()
7557+
fdev_major = format(int(0), 'x').lower()
7558+
fdev_minor = format(int(0), 'x').lower()
75297559
frdev = format(int(0), 'x').lower()
7560+
frdev_major = format(int(0), 'x').lower()
7561+
frdev_minor = format(int(0), 'x').lower()
75307562
if(ftype == 5):
75317563
fsize = format(int(0), 'x').lower()
75327564
elif(ftype == 0):
@@ -7773,7 +7805,11 @@ def AppendFilesWithContentFromRarFileToList(infile, fmttype="auto", extradata=[]
77737805
curfid = curfid + 1
77747806
flinkcount = format(int(flinkcount), 'x').lower()
77757807
fdev = format(int(0), 'x').lower()
7808+
fdev_major = format(int(0), 'x').lower()
7809+
fdev_minor = format(int(0), 'x').lower()
77767810
frdev = format(int(0), 'x').lower()
7811+
frdev_major = format(int(0), 'x').lower()
7812+
frdev_minor = format(int(0), 'x').lower()
77777813
if(ftype == 5):
77787814
fsize = format(int(0), 'x').lower()
77797815
elif(ftype == 0):
@@ -8015,7 +8051,11 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, fmttype="auto", extrada
80158051
curfid = curfid + 1
80168052
flinkcount = format(int(flinkcount), 'x').lower()
80178053
fdev = format(int(0), 'x').lower()
8054+
fdev_major = format(int(0), 'x').lower()
8055+
fdev_minor = format(int(0), 'x').lower()
80188056
frdev = format(int(0), 'x').lower()
8057+
frdev_major = format(int(0), 'x').lower()
8058+
frdev_minor = format(int(0), 'x').lower()
80198059
if(ftype == 5):
80208060
fsize = format(int(0), 'x').lower()
80218061
fatime = format(int(to_ns(member.creationtime.timestamp())), 'x').lower()

0 commit comments

Comments
 (0)