Changeset 95c675b in mainline for uspace/srv/fs/fat/fat_dentry.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/srv/fs/fat/fat_dentry.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_dentry.c

@@ -180 +180 @@
 }
 
+void fat_dentry_vollabel_get(const fat_dentry_t *d, char *buf)
+{
+        unsigned int i;
+        
+        for (i = 0; i < FAT_NAME_LEN; i++) {
+                if (d->name[i] == FAT_PAD)
+                        break;
+                
+                if (d->name[i] == FAT_DENTRY_E5_ESC)
+                        *buf++ = 0xe5;
+                else
+                        *buf++ = d->name[i];
+        }
+        
+        for (i = 0; i < FAT_EXT_LEN; i++) {
+                if (d->ext[i] == FAT_PAD) {
+                        *buf = '\0';
+                        return;
+                }
+                
+                if (d->ext[i] == FAT_DENTRY_E5_ESC)
+                        *buf++ = 0xe5;
+                else
+                        *buf++ = d->ext[i];
+        }
+        
+        *buf = '\0';
+}
+
 fat_dentry_clsf_t fat_classify_dentry(const fat_dentry_t *d)
 {
@@ -191 +220 @@
         if (d->attr & FAT_ATTR_VOLLABEL) {
                 /* volume label entry */
-                return FAT_DENTRY_SKIP;
+                return FAT_DENTRY_VOLLABEL;
         }
         if (d->name[0] == FAT_DENTRY_ERASED) {
@@ -398 +427 @@
 }
 
-size_t utf16_length(const uint16_t *wstr)
-{
-        size_t len = 0;
-        
-        while (*wstr++ != 0)
-                len++;
-        
-        return len;
-}
-
 /**
  * @}