Changes in tools/mkfat.py [042fbe0:28f4adb] in mainline

File:

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

tools/mkfat.py

@@ -190 +190 @@
         parts = name.split('.')
         
-        if len(parts) > 0:
+        if (len(parts) > 0):
                 fname = parts[0]
         else:
                 fname = ''
-        
-        if len(fname) > 8:
-                sys.stdout.write("mkfat.py: error: Directory entry " + name +
-                    " base name is longer than 8 characters\n")
-                sys.exit(1);
-        
+                
         return (fname + '          ').upper()[0:8]
 
@@ -206 +201 @@
         parts = name.split('.')
         
-        if len(parts) > 1:
+        if (len(parts) > 1):
                 ext = parts[1]
         else:
                 ext = ''
-        
-        if len(parts) > 2:
-                sys.stdout.write("mkfat.py: error: Directory entry " + name +
-                    " has more than one extension\n")
-                sys.exit(1);
-        
-        if len(ext) > 3:
-                sys.stdout.write("mkfat.py: error: Directory entry " + name +
-                    " extension is longer than 3 characters\n")
-                sys.exit(1);
         
         return (ext + '   ').upper()[0:3]
@@ -226 +211 @@
         dir_entry = xstruct.create(DIR_ENTRY)
         
-        dir_entry.name = mangle_fname(name).encode('ascii')
-        dir_entry.ext = mangle_ext(name).encode('ascii')
+        dir_entry.name = mangle_fname(name)
+        dir_entry.ext = mangle_ext(name)
         
         if (directory):
@@ -254 +239 @@
         
         dir_entry.signature = 0x2e
-        dir_entry.name = b'       '
-        dir_entry.ext = b'   '
+        dir_entry.name = '       '
+        dir_entry.ext = '   '
         dir_entry.attr = 0x10
         
@@ -273 +258 @@
         
         dir_entry.signature = [0x2e, 0x2e]
-        dir_entry.name = b'      '
-        dir_entry.ext = b'   '
+        dir_entry.name = '      '
+        dir_entry.ext = '   '
         dir_entry.attr = 0x10
         
@@ -385 +370 @@
         reserved_clusters = 2
         
-        # Make sure the filesystem is large enough for FAT16
+        # Make sure the filesystem is large enought for FAT16
         size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + extra_bytes
         while (size // cluster_size < fat16_clusters):