Changes in tools/mkfat.py [cc1a727:432f68a] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tools/mkfat.py
rcc1a727 r432f68a 37 37 import xstruct 38 38 import array 39 from imgutil import * 39 40 exclude_names = set(['.svn', '.bzr']) 41 42 def align_up(size, alignment): 43 "Return size aligned up to alignment" 44 45 if (size % alignment == 0): 46 return size 47 48 return ((size // alignment) + 1) * alignment 40 49 41 50 def subtree_size(root, cluster_size, dirent_size): … … 45 54 files = 2 46 55 47 for item in listdir_items(root): 48 if item.is_file: 49 size += align_up(item.size, cluster_size) 56 for name in os.listdir(root): 57 canon = os.path.join(root, name) 58 59 if (os.path.isfile(canon) and (not name in exclude_names)): 60 size += align_up(os.path.getsize(canon), cluster_size) 50 61 files += 1 51 elif item.is_dir: 52 size += subtree_size(item.path, cluster_size, dirent_size) 62 63 if (os.path.isdir(canon) and (not name in exclude_names)): 64 size += subtree_size(canon, cluster_size, dirent_size) 53 65 files += 1 54 66 … … 60 72 return len(os.listdir(root)) 61 73 62 def write_file( item, outf, cluster_size, data_start, fat, reserved_clusters):74 def write_file(path, outf, cluster_size, data_start, fat, reserved_clusters): 63 75 "Store the contents of a file" 64 76 77 size = os.path.getsize(path) 65 78 prev = -1 66 79 first = 0 67 80 68 for data in chunks(item, cluster_size): 81 inf = open(path, "rb") 82 rd = 0; 83 while (rd < size): 69 84 empty_cluster = fat.index(0) 70 85 fat[empty_cluster] = 0xffff … … 77 92 prev = empty_cluster 78 93 94 data = bytes(inf.read(cluster_size)); 79 95 outf.seek(data_start + (empty_cluster - reserved_clusters) * cluster_size) 80 96 outf.write(data) 81 82 return first, item.size 97 rd += len(data) 98 inf.close() 99 100 return first, size 83 101 84 102 def write_directory(directory, outf, cluster_size, data_start, fat, reserved_clusters, dirent_size, empty_cluster): … … 172 190 parts = name.split('.') 173 191 174 if len(parts) > 0:192 if (len(parts) > 0): 175 193 fname = parts[0] 176 194 else: 177 195 fname = '' 178 179 if len(fname) > 8: 180 sys.stdout.write("mkfat.py: error: Directory entry " + name + 181 " base name is longer than 8 characters\n") 182 sys.exit(1); 183 196 184 197 return (fname + ' ').upper()[0:8] 185 198 … … 188 201 parts = name.split('.') 189 202 190 if len(parts) > 1:203 if (len(parts) > 1): 191 204 ext = parts[1] 192 205 else: 193 206 ext = '' 194 195 if len(parts) > 2:196 sys.stdout.write("mkfat.py: error: Directory entry " + name +197 " has more than one extension\n")198 sys.exit(1);199 200 if len(ext) > 3:201 sys.stdout.write("mkfat.py: error: Directory entry " + name +202 " extension is longer than 3 characters\n")203 sys.exit(1);204 207 205 208 return (ext + ' ').upper()[0:3] … … 285 288 empty_cluster = 0 286 289 287 for item in listdir_items(root): 288 if item.is_file: 289 rv = write_file(item, outf, cluster_size, data_start, fat, reserved_clusters) 290 directory.append(create_dirent(item.name, False, rv[0], rv[1])) 291 elif item.is_dir: 292 rv = recursion(False, item.path, outf, cluster_size, root_start, data_start, fat, reserved_clusters, dirent_size, empty_cluster) 293 directory.append(create_dirent(item.name, True, rv[0], rv[1])) 290 for name in os.listdir(root): 291 canon = os.path.join(root, name) 292 293 if (os.path.isfile(canon) and (not name in exclude_names)): 294 rv = write_file(canon, outf, cluster_size, data_start, fat, reserved_clusters) 295 directory.append(create_dirent(name, False, rv[0], rv[1])) 296 297 if (os.path.isdir(canon) and (not name in exclude_names)): 298 rv = recursion(False, canon, outf, cluster_size, root_start, data_start, fat, reserved_clusters, dirent_size, empty_cluster) 299 directory.append(create_dirent(name, True, rv[0], rv[1])) 294 300 295 301 if (head):
Note:
See TracChangeset
for help on using the changeset viewer.