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

Timestamp:

2012-04-14T14:00:02Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

b6d7b7c

Parents:

1fff583 (diff), 1db6dfd (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 with mainline

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;