Changeset 694ca93f in mainline for tools/mkfat.py

Timestamp:

2011-05-01T19:34:26Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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) (2 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]
 
@@ -201 +206 @@
         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]