Changeset db96017 in mainline for uspace/srv/fs/exfat/exfat_dentry.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/fs/exfat/exfat_dentry.c (modified) (1 diff)

uspace/srv/fs/exfat/exfat_dentry.c

@@ -101 +101 @@
 bool exfat_valid_char(wchar_t ch)
 {
-        /* TODO */
-        return true;
+        switch (ch) {
+        case 0x01 ... 0x1F:
+        case '/':
+        case '\\':
+        case '?':
+        case '|':
+        case '>':
+        case '<':
+        case '"':
+        case '*':
+        case ':':
+                return false;
+        default:
+                return true;
+        }
 }
 
 bool exfat_valid_name(const char *name)
 {
-        /* TODO */
+        size_t off = 0;
+        wchar_t ch;
+
+        while ((ch = str_decode(name, &off, STR_NO_LIMIT)) != 0) {
+                if (!exfat_valid_char(ch))
+                        return false;
+        }
         return true;
 }
 
-size_t utf16_length(const uint16_t *wstr)
+size_t exfat_utf16_length(const uint16_t *wstr)
 {
         size_t len = 0;