Changeset 419 for trunk

Timestamp:

Jan 18, 2018, 6:29:27 PM (6 years ago)

Author:

alain

Message:

Fis a bug in function get_name_from_short() in boot_fat32.c

File:

• trunk/tools/bootloader_tsar/boot_fat32.c (modified) (2 diffs)

trunk/tools/bootloader_tsar/boot_fat32.c

@@ -539 +539 @@
     uint32_t buffer_offset;     /* Index used to write to the buffer.   */
 
-    /* Initializing the variables. */
     entry_offset    = 0;
     buffer_offset   = 0;
 
-    /* Getting the file name. */
+    // get the file name without suffix
     while ((entry_offset < 8) && (entry[entry_offset] != ' '))
+    {
         buffer[buffer_offset++] = boot_to_lower(entry[entry_offset++]);
+    }
+
+    // set entry to first suffix character 
+    entry_offset = 8;
+
+    if( entry[entry_offset] == ' ' )        // no suffix in name
+    {
+        // append the trailing NUL in buffer
+        buffer[buffer_offset] = '\0';
+    }
+    else                                    // there is a suffix
+    {
+        // append the '.' in buffer    
+        buffer[buffer_offset++] = '.';
+
+        // get the file extension
+        while ((entry_offset < 11) && (entry[entry_offset] != ' '))
+        {
+            buffer[buffer_offset++] = boot_to_lower(entry[entry_offset++]);
+        }
     
-    /* Appending the dot to the name buffer. */
-    buffer[buffer_offset++] = '.';
-
-    /* Getting the file extension. */
-    while ((entry_offset < 11) && (entry[entry_offset] != ' '))
-        buffer[buffer_offset++] = boot_to_lower(entry[entry_offset++]);
-    
-    /* Appending the trailing NUL to the buffer. */
-    buffer[buffer_offset++] = '\0';
+        // append the trailing NUL in buffer
+        buffer[buffer_offset] = '\0';
+    }
         
 } // get_name_from_short()
@@ -674 +688 @@
                     if (lfn_seq_elem_nr == 0) get_name_from_short(entry, name);
 
+
+#if DEBUG_BOOT_FAT32    
+    boot_printf("\n[BOOT INFO] in %s : name = %s / entry = %s \n",
+                __FUNCTION__ , name , entry );
+#endif
+
+
+
                     // check if the full name is what we are looking for.
                     if (boot_strcmp(name, path_comp) == 0)