Changeset 20235a3 in mainline for tools/mkfat.py

Timestamp:

2010-09-02T20:55:28Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• tools/mkfat.py (modified) (3 diffs)

tools/mkfat.py

@@ -343 +343 @@
 def usage(prname):
         "Print usage syntax"
-        print prname + " <PATH> <IMAGE>"
+        print prname + " <EXTRA_BYTES> <PATH> <IMAGE>"
 
 def main():
-        if (len(sys.argv) < 3):
+        if (len(sys.argv) < 4):
                 usage(sys.argv[0])
                 return
         
-        path = os.path.abspath(sys.argv[1])
+        if (not sys.argv[1].isdigit()):
+                print "<EXTRA_BYTES> must be a number"
+                return
+        
+        extra_bytes = int(sys.argv[1])
+        
+        path = os.path.abspath(sys.argv[2])
         if (not os.path.isdir(path)):
                 print "<PATH> must be a directory"
@@ -365 +371 @@
         
         # Make sure the filesystem is large enought for FAT16
-        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size
+        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + extra_bytes
         while (size / cluster_size < fat16_clusters):
                 if (cluster_size > sector_size):
                         cluster_size /= 2
-                        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size
+                        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + extra_bytes
                 else:
                         size = fat16_clusters * cluster_size + reserved_clusters * cluster_size
@@ -381 +387 @@
         data_start = root_start + root_size
         
-        outf = file(sys.argv[2], "w")
+        outf = file(sys.argv[3], "w")
         
         boot_sector = xstruct.create(BOOT_SECTOR)