Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3561 → Rev 3535

/branches/dynload/tools/mkfat.py
36,8 → 36,6
import xstruct
import array
 
exclude_names = set(['.svn'])
 
def align_up(size, alignment):
"Return size aligned up to alignment"
55,11 → 53,11
for name in os.listdir(root):
canon = os.path.join(root, name)
if (os.path.isfile(canon) and (not name in exclude_names)):
if (os.path.isfile(canon)):
size += align_up(os.path.getsize(canon), cluster_size)
files += 1
if (os.path.isdir(canon) and (not name in exclude_names)):
if (os.path.isdir(canon)):
size += subtree_size(canon, cluster_size, dirent_size)
files += 1
288,11 → 286,11
for name in os.listdir(root):
canon = os.path.join(root, name)
if (os.path.isfile(canon) and (not name in exclude_names)):
if (os.path.isfile(canon)):
rv = write_file(canon, outf, cluster_size, data_start, fat, reserved_clusters)
directory.append(create_dirent(name, False, rv[0], rv[1]))
if (os.path.isdir(canon) and (not name in exclude_names)):
if (os.path.isdir(canon)):
rv = recursion(False, canon, outf, cluster_size, root_start, data_start, fat, reserved_clusters, dirent_size, empty_cluster)
directory.append(create_dirent(name, True, rv[0], rv[1]))
353,6 → 351,7
return
fat16_clusters = 4096
min_cluster_size = 1024
sector_size = 512
cluster_size = 4096
364,7 → 363,7
# Make sure the filesystem is large enought for FAT16
size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size
while (size / cluster_size < fat16_clusters):
if (cluster_size > sector_size):
if (cluster_size > min_cluster_size):
cluster_size /= 2
size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size
else:
/branches/dynload/tools/mktmpfs.py
34,8 → 34,6
import os
import xstruct
 
exclude_names = set(['.svn'])
 
HEADER = """little:
char tag[5] /* 'TMPFS' */
"""
72,7 → 70,7
for name in os.listdir(root):
canon = os.path.join(root, name)
if (os.path.isfile(canon) and (not name in exclude_names)):
if (os.path.isfile(canon)):
size = os.path.getsize(canon)
dentry = xstruct.create(DENTRY_FILE % len(name))
91,7 → 89,7
rd += len(data)
inf.close()
if (os.path.isdir(canon) and (not name in exclude_names)):
if (os.path.isdir(canon)):
dentry = xstruct.create(DENTRY_DIRECTORY % len(name))
dentry.kind = TMPFS_DIRECTORY
dentry.fname_len = len(name)