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

Timestamp:

2017-10-17T13:11:35Z (7 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_directory.c (modified) (5 diffs)

uspace/srv/fs/fat/fat_directory.c

@@ -223 +223 @@
                         *de = d;
                         return EOK;
-                default:
                 case FAT_DENTRY_SKIP:
                 case FAT_DENTRY_FREE:
+                case FAT_DENTRY_VOLLABEL:
+                default:
                         long_entry_count = 0;
                         long_entry = false;
@@ -252 +253 @@
         while (!flag && fat_directory_prev(di) == EOK) {
                 if (fat_directory_get(di, &d) == EOK &&
-                    fat_classify_dentry(d) == FAT_DENTRY_LFN &&                 
+                    fat_classify_dentry(d) == FAT_DENTRY_LFN && 
                     checksum == FAT_LFN_CHKSUM(d)) {
                         if (FAT_IS_LFN(d))
@@ -300 +301 @@
                         return rc;
                 
-                lfn_size = utf16_length(wname);
+                lfn_size = utf16_wsize(wname);
                 long_entry_count = lfn_size / FAT_LFN_ENTRY_SIZE;
                 if (lfn_size % FAT_LFN_ENTRY_SIZE)
@@ -473 +474 @@
                         case FAT_DENTRY_LFN:
                         case FAT_DENTRY_SKIP:
+                        case FAT_DENTRY_VOLLABEL:
                         default:
                                 found = 0;
@@ -523 +525 @@
                 case FAT_DENTRY_LFN:
                 case FAT_DENTRY_SKIP:
+                case FAT_DENTRY_VOLLABEL:
                 case FAT_DENTRY_FREE:
                         break;
                 }
-        } while (fat_directory_next(di) == EOK);        
+        } while (fat_directory_next(di) == EOK);
 
         return false;
+}
+
+/** Find volume label entry in a directory.
+ *
+ * @return EOK on success, ENOENT if not found, EIO on I/O error
+ */
+int fat_directory_vollabel_get(fat_directory_t *di, char *label)
+{
+        fat_dentry_t *d;
+        int rc;
+
+        fat_directory_seek(di, 0);
+        do {
+                rc = fat_directory_get(di, &d);
+                if (rc != EOK)
+                        return EIO;
+
+                switch (fat_classify_dentry(d)) {
+                case FAT_DENTRY_VOLLABEL:
+                        fat_dentry_vollabel_get(d, label);
+                        return EOK;
+                default:
+                        break;
+                }
+        } while (fat_directory_next(di) == EOK);
+
+        /* Not found */
+        return ENOENT;
 }