Changeset cc76be3 in mainline

Timestamp:

2007-12-14T18:12:17Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

74303b6

Parents:

5832e9b

Message:

VFS work.
During VFS_REGISTER, use strncmp() instead of strcmp().
Add one excessive convenience byte to vfs_info.name to support the
above-mentioned change. In case the fs name spans all available
characters, make sure this convenience byte is zero.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_register.c (modified) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -84 +84 @@
 typedef struct {
         /** Unique identifier of the fs. */
-        char name[FS_NAME_MAXLEN];
+        char name[FS_NAME_MAXLEN + 1];
         
         /** Operations. */

uspace/srv/vfs/vfs_register.c

@@ -88 +88 @@
                         }
                 }
+        }
+        /*
+         * This check is not redundant. It ensures that the name is
+         * NULL-terminated, even if FS_NAME_MAXLEN characters are used.
+         */
+        if (info->name[i] != '\0') {
+                dprintf("The name is not properly NULL-terminated.\n"); 
+                return false;
         }
         
@@ -401 +409 @@
         for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
                 fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-                if (strcmp(fs->vfs_info.name, name) == 0) { /* XXX: strncmp() */
+                if (strncmp(fs->vfs_info.name, name,
+                    sizeof(fs->vfs_info.name)) == 0) { 
                         handle = fs->fs_handle;
                         break;