Changeset eb522e8 in mainline for tools/mkfat.py

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• tools/mkfat.py (modified) (5 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]
@@ -211 +226 @@
         dir_entry = xstruct.create(DIR_ENTRY)
         
-        dir_entry.name = mangle_fname(name)
-        dir_entry.ext = mangle_ext(name)
+        dir_entry.name = mangle_fname(name).encode('ascii')
+        dir_entry.ext = mangle_ext(name).encode('ascii')
         
         if (directory):
@@ -239 +254 @@
         
         dir_entry.signature = 0x2e
-        dir_entry.name = '       '
-        dir_entry.ext = '   '
+        dir_entry.name = b'       '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10
         
@@ -258 +273 @@
         
         dir_entry.signature = [0x2e, 0x2e]
-        dir_entry.name = '      '
-        dir_entry.ext = '   '
+        dir_entry.name = b'      '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10