Changeset 2d0d637 in mainline

Timestamp:

2011-06-21T18:56:31Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

61e29a4d

Parents:

9553d7d

Message:

Functions for checking string compatibility with SFN requirements

Location:

uspace/srv/fs/fat

Files:

• fat_dentry.c (modified) (1 diff)
• fat_dentry.h (modified) (1 diff)
• fat_directory.c (modified) (1 diff)
• fat_directory.h (modified) (1 diff)

uspace/srv/fs/fat/fat_dentry.c

@@ -394 +394 @@
 }
 
+bool fat_lfn_valid_char(uint16_t c)
+{
+        char valid[] = {"_.$%\'-@~!(){}^#&"};
+        size_t idx=0;
+
+        if (c > 0xff) return false;
+        if (isdigit(c) || (isalpha(c) && isupper(c)))
+                return true;    
+        while(valid[idx]!=0)
+                if (c == valid[idx++])
+                        return true;
+
+        return false;
+}
+
+bool fat_lfn_valid_str(const uint16_t *str)
+{
+        uint16_t c;
+        size_t idx=0;
+        if (str[idx] == 0 || str[idx] == '.')
+                return false;
+        while ((c=str[idx++]) != 0) {
+                if (!fat_lfn_valid_char(c))
+                        return false;
+        }
+        return true;
+}
+
+/** Get number of characters in a wide string.
+ *
+ * @param str NULL-terminated wide string.
+ *
+ * @return Number of characters in @a str.
+ *
+ */
+size_t utf16_length(const uint16_t *wstr)
+{
+        size_t len = 0;
+        
+        while (*wstr++ != 0)
+                len++;
+        return len;
+}
+
+bool fat_dentry_is_sfn(const uint16_t *str)
+{
+        /* 1. Length <= 11 characters */
+        if (utf16_length(str) > (FAT_NAME_LEN + FAT_EXT_LEN))
+                return false;
+        /* 
+         * 2. All characters in string should be ASCII
+         * 3. All letters must be uppercase
+         * 4. String should not contain invalid characters
+         */
+        if (!fat_lfn_valid_str(str))
+                return false;
+        
+        return true;
+}
+
 
 /**

uspace/srv/fs/fat/fat_dentry.h

@@ -140 +140 @@
 extern size_t fat_lfn_copy_part(const uint16_t *, size_t, uint16_t *, size_t *);
 extern size_t fat_lfn_copy_entry(const fat_dentry_t *, uint16_t *, size_t *);
+
 extern int utf16_to_str(char *, size_t, const uint16_t *);
 extern int str_to_utf16(uint16_t *, size_t, const char *);
+extern bool fat_lfn_valid_char(uint16_t);
+extern bool fat_lfn_valid_str(const uint16_t *);
+extern size_t utf16_length(const uint16_t *);
+extern bool fat_dentry_is_sfn(const uint16_t *);
 
 

uspace/srv/fs/fat/fat_directory.c

@@ -254 +254 @@
 }
 
+int fat_directory_write(fat_directory_t *di, char *name, fat_dentry_t *de)
+{
+        /* TODO: create LFN records if necessarry and create SFN record */
+        return EOK;
+}
+
+
 
 /**

uspace/srv/fs/fat/fat_directory.h

@@ -67 +67 @@
 
 extern int fat_directory_read(fat_directory_t *, char *, fat_dentry_t **);
+extern int fat_directory_write(fat_directory_t *, char *, fat_dentry_t *);
 extern int fat_directory_erase(fat_directory_t *);