Changeset 619 for soft

Timestamp:

Jul 16, 2015, 3:29:10 PM (9 years ago)

Author:

guerin

Message:

fat32: use strcmp instead of strncmp

The length argument was wrong most of the time. Avoid confusion by
not specifying it.

File:

• soft/giet_vm/giet_fat32/fat32.c (modified) (8 diffs)

soft/giet_vm/giet_fat32/fat32.c

@@ -2043 +2043 @@
         name , parent->name );
 #endif
-
-    // compute name lenth
-    unsigned int length = _strlen( name );
     
     // scan inodes in the parent directory 
     for ( current = parent->child ; current ; current = current->next )
     {
-        if ( _strncmp( name , current->name , length ) == 0 ) 
+        if ( _strcmp( name , current->name ) == 0 )
         {
 
@@ -2153 +2150 @@
                     
                 // test if extracted name == searched name
-                if ( _strncmp( name , cname , length ) == 0 )
+                if ( _strcmp( name , cname ) == 0 )
                 {
                     cluster = (_read_entry( DIR_FST_CLUS_HI , buffer + offset , 1 ) << 16) |
@@ -2223 +2220 @@
 
     // handle root directory case
-    if ( _strncmp( pathname , "/" , 2 ) == 0 )
+    if ( _strcmp( pathname , "/" ) == 0 )
     {
 
@@ -2259 +2256 @@
 #endif
 
-        if ( _strncmp( name, "..", _strlen( name ) + 1 ) == 0)
+        if ( _strcmp( name, ".." ) == 0)
         {
             // found special name "..", try to go up
@@ -2268 +2265 @@
                 child = parent;
         }
-        else if ( _strncmp( name, ".", _strlen( name ) + 1 ) == 0 )
+        else if ( _strcmp( name, "." ) == 0 )
         {
             // found special name ".", stay on the same level
@@ -2412 +2409 @@
     char            cname[32];            // buffer for a full name in a directory entry
     unsigned int    nb_read;              // number of characters analysed in path 
-    unsigned int    length;               // searched name length
     unsigned int    parent_cluster;       // cluster index for the parent directory 
     unsigned int    child_cluster = 0;    // cluster index for the searched file/dir
@@ -2445 +2441 @@
 #endif
         found  = 0;
-        length = _strlen( name );
 
         // scan clusters containing the parent directory
@@ -2520 +2515 @@
                     
                     // test if extracted name == searched name
-                    if ( _strncmp( name , cname , length ) == 0 )
+                    if ( _strcmp( name , cname ) == 0 )
                     {
                         child_cluster = (_read_entry( DIR_FST_CLUS_HI , buf , 1 ) << 16) |