Changes in tools/mkfat.py [14f2100:3c80f2b] in mainline

File:

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

tools/mkfat.py

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