Changeset 4372b49 in mainline for uspace/srv/fs/fat/fat_directory.c

Timestamp:

2011-06-21T12:02:24Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

9553d7d

Parents:

563686b

Message:

Fixes for api and better unicode support.

File:

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

uspace/srv/fs/fat/fat_directory.c

@@ -41 +41 @@
 #include <byteorder.h>
 #include <mem.h>
+#include <str.h>
 
 int fat_directory_block_load(fat_directory_t *);
@@ -58 +59 @@
         di->last = false;
 
-        di->lfn_utf16[0] = '\0';
+        di->wname[0] = '\0';
         di->lfn_offset = 0;
         di->lfn_size = 0;
@@ -174 +175 @@
                                                 (di->checksum == FAT_LFN_CHKSUM(d))) {
                                                 /* Right order! */
-                                                di->lfn_offset = fat_lfn_copy_entry(d, di->lfn_utf16, 
-                                                        di->lfn_offset);
+                                                fat_lfn_copy_entry(d, di->wname, &di->lfn_offset);
                                         } else {
                                                 /* Something wrong with order. Skip this long entries set */
@@ -190 +190 @@
                                                                 (FAT_LFN_COUNT(d) - 1)) + fat_lfn_size(d);
                                                         di->lfn_offset = di->lfn_size;
-                                                        di->lfn_offset = fat_lfn_copy_entry(d, di->lfn_utf16, 
-                                                                di->lfn_offset);
+                                                        fat_lfn_copy_entry(d, di->wname, &di->lfn_offset);
                                                         di->checksum = FAT_LFN_CHKSUM(d);
                                                 }
@@ -200 +199 @@
                                 if (di->long_entry && 
                                         (di->checksum == fat_dentry_chksum(d->name))) {
-                                        int rc;
-                                        rc = fat_lfn_convert_name(di->lfn_utf16, di->lfn_size, 
-                                                (uint8_t*)name, FAT_LFN_NAME_SIZE);
-                                        if (rc!=EOK)
+                                        di->wname[di->lfn_size] = '\0';
+                                        if (utf16_to_str(name, FAT_LFN_NAME_SIZE, di->wname)!=EOK)
                                                 fat_dentry_name_get(d, name);
                                 }