Changeset d2e9c47 in mainline

Timestamp:

2008-08-10T09:19:32Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

da349da0

Parents:

2dd7288

Message:

Several fixes for the FAT file system:

• do not copy padding during file name canonization
• properly nul-terminate the FAT file name during canonization
• compare FAT file name and the component name case insensitively
• block_get() takes a block offset, not byte offset as parameter

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (5 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -76 +76 @@
 
         for (i = 0; i < FAT_NAME_LEN; i++) {
-                if (d->name[i] == FAT_PAD) {
-                        buf++;
+                if (d->name[i] == FAT_PAD)
                         break;
-                }
                 if (d->name[i] == FAT_DENTRY_E5_ESC)
                         *buf++ = 0xe5;
@@ -97 +95 @@
                         *buf++ = d->ext[i];
         }
+        *buf = '\0';
 }
 
@@ -114 +113 @@
         off_t bufpos = 0;
         size_t buflen = 0;
+        off_t pos = offset * bs;
 
         assert(dev_phone != -1);
@@ -129 +129 @@
         b->size = bs;
 
-        if (!libfs_blockread(dev_phone, dev_buffer, &bufpos, &buflen, &offset,
+        if (!libfs_blockread(dev_phone, dev_buffer, &bufpos, &buflen, &pos,
             b->data, bs, bs)) {
                 free(b->data);
@@ -458 +458 @@
                                 break;
                         }
-                        if (strcmp(name, component) == 0) {
+                        if (stricmp(name, component) == 0) {
                                 /* hit */
                                 void *node;