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

Timestamp:

2012-04-07T17:42:36Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a1d7b4b

Parents:

db96017

Message:

When a FAT filesystem is mounted with the 'nolfn' mount option, besides
writing new dentries in the 8.3 format, also read dentries only in the
8.3 format. Note that some other aspects (such as complete cleanup of
the LFN dentries on SFN erase) of LFN are still active even with
'nolfn'.

File:

• uspace/srv/fs/fat/fat_directory.c (modified) (4 diffs)

uspace/srv/fs/fat/fat_directory.c

@@ -162 +162 @@
         int rc;
 
+        void *data;
+        fat_instance_t *instance;
+
+        rc = fs_instance_get(di->nodep->idx->service_id, &data);
+        assert(rc == EOK);
+        instance = (fat_instance_t *) data;
+        
         do {
                 rc = fat_directory_get(di, &d);
@@ -177 +184 @@
                                 long_entry_count--;
                                 if ((FAT_LFN_ORDER(d) == long_entry_count) && 
-                                        (checksum == FAT_LFN_CHKSUM(d))) {
+                                    (checksum == FAT_LFN_CHKSUM(d))) {
                                         /* Right order! */
                                         fat_lfn_get_entry(d, wname,
@@ -189 +196 @@
                                         long_entry = false;
                                 }
-                        } else if (FAT_IS_LFN(d)) {
+                        } else if (FAT_IS_LFN(d) && instance->lfn_enabled) {
                                 /* We found Last long entry! */
                                 if (FAT_LFN_COUNT(d) <= FAT_LFN_MAX_COUNT) {
@@ -308 +315 @@
                 checksum = fat_dentry_chksum(de->name);
 
-                rc = fat_directory_seek(di, start_pos+long_entry_count);
+                rc = fat_directory_seek(di, start_pos + long_entry_count);
                 if (rc != EOK)
                         return rc;