Changeset 3e018e45 in mainline

Timestamp:

2011-07-07T20:03:19Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

af4dec0

Parents:

411e9ca

Message:

1. Rewrite fat_directory_write to support:

• using new fat_valid_name and fat_valid_short_name functions
• flag for disabling/enabling LFN support on writing
• using uint16_t instead of wchar_t for UTF16

2. Rewrite fat_directory_create_sfn to support using uint16_t

instead of wchar_t for UTF16

Location:

uspace/srv/fs/fat

Files:

• fat_directory.c (modified) (5 diffs)
• fat_directory.h (modified) (1 diff)

uspace/srv/fs/fat/fat_directory.c

@@ -255 +255 @@
 {
         int rc;
-        int long_entry_count;
-        uint8_t checksum;
-        wchar_t wname[FAT_LFN_NAME_SIZE];
-        size_t lfn_size, lfn_offset;
-        
-        rc = str_to_wstr(wname, FAT_LFN_NAME_SIZE, name);
-        if (rc != EOK)
-                return rc;
-        if (fat_dentry_is_sfn(wname)) {
+        bool enable_lfn = true; /* We can use this variable to switch off LFN support */
+        
+        if (fat_valid_short_name(name)) {
                 /* NAME could be directly stored in dentry without creating LFN */
                 fat_dentry_name_set(de, name);
-
                 if (fat_directory_is_sfn_exist(di, de))
                         return EEXIST;
@@ -273 +266 @@
                         return rc;
                 rc = fat_directory_write_dentry(di, de);
-                if (rc != EOK)
-                        return rc;
-
-                return EOK;
-        }
-        else
-        {
+                return rc;
+        } else if (enable_lfn && fat_valid_name(name)) {
                 /* We should create long entries to store name */
-                lfn_size = wstr_length(wname);
+                int long_entry_count;
+                uint8_t checksum;
+                uint16_t wname[FAT_LFN_NAME_SIZE];
+                size_t lfn_size, lfn_offset;
+                
+                rc = str_to_utf16(wname, FAT_LFN_NAME_SIZE, name);
+                if (rc != EOK)
+                        return rc;
+                
+                lfn_size = utf16_length(wname);
                 long_entry_count = lfn_size / FAT_LFN_ENTRY_SIZE;
                 if (lfn_size % FAT_LFN_ENTRY_SIZE)
@@ -291 +288 @@
 
                 /* Write Short entry */
-                rc = fat_directory_create_sfn(di, de, wname);
+                rc = fat_directory_create_sfn(di, de, name);
                 if (rc != EOK)
                         return rc;
@@ -322 +319 @@
 
                 rc = fat_directory_seek(di, start_pos+long_entry_count);
-                if (rc != EOK)
-                        return rc;
-                return EOK;
-        }
-}
-
-int fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de, const wchar_t *wname)
+                return rc;
+        }
+
+        return ENOTSUP;
+}
+
+int fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de, const char *lname)
 {
         char name[FAT_NAME_LEN+1];
@@ -337 +334 @@
         memset(number, FAT_PAD, FAT_NAME_LEN);
 
-        size_t name_len = wstr_size(wname);
-        wchar_t *pdot = wstr_rchr(wname, '.');
+        size_t name_len = str_size(lname);
+        char *pdot = str_rchr(lname, '.');
         ext[FAT_EXT_LEN] = '\0';
         if (pdot) {
                 pdot++;
-                wstr_to_ascii(ext, pdot, FAT_EXT_LEN, FAT_SFN_CHAR);
-                name_len = (pdot - wname - 1);
+                str_to_ascii(ext, pdot, FAT_EXT_LEN, FAT_SFN_CHAR);
+                name_len = (pdot - lname - 1);
         }
         if (name_len > FAT_NAME_LEN)
                 name_len = FAT_NAME_LEN;
-        wstr_to_ascii(name, wname, name_len, FAT_SFN_CHAR);
+        str_to_ascii(name, lname, name_len, FAT_SFN_CHAR);
 
         size_t idx;

uspace/srv/fs/fat/fat_directory.h

@@ -68 +68 @@
 extern int fat_directory_lookup_free(fat_directory_t *di, size_t count);
 extern int fat_directory_write_dentry(fat_directory_t *di, fat_dentry_t *de);
-extern int fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de, const wchar_t *wname);
+extern int fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de, const char *lname);
 extern int fat_directory_expand(fat_directory_t *di);