Changeset f5f1e1c in mainline

Timestamp:

2011-07-18T11:32:12Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

5dac8ab

Parents:

1f78546

Message:

exFAT: fix exfat_directory_read_file

Location:

uspace/srv/fs/exfat

Files:

• exfat_directory.c (modified) (3 diffs)
• exfat_directory.h (modified) (1 diff)

uspace/srv/fs/exfat/exfat_directory.c

@@ -180 +180 @@
 
 
-int exfat_directory_read_file(exfat_directory_t *di, char *name, exfat_file_dentry_t *df, exfat_stream_dentry_t *ds)
+int exfat_directory_read_file(exfat_directory_t *di, char *name, size_t size, 
+    exfat_file_dentry_t *df, exfat_stream_dentry_t *ds)
 {
         uint16_t wname[EXFAT_FILENAME_LEN+1];
@@ -201 +202 @@
                 return ENOENT;
         *ds  = d->stream;
-/*      
-        if (ds->name_size > EXFAT_FILENAME_LEN)
+        
+        if (ds->name_size > size)
                 return EOVERFLOW;
-*/
+
         for (i=0; i<df->count-1; i++) {
                 rc = exfat_directory_next(di);
@@ -216 +217 @@
                 exfat_dentry_get_name(&d->name, ds->name_size, wname, &offset);
         }
-        rc = utf16_to_str(name, EXFAT_FILENAME_LEN, wname);
+        rc = utf16_to_str(name, size, wname);
         if (rc != EOK)
                 return rc;

uspace/srv/fs/exfat/exfat_directory.h

@@ -63 +63 @@
     exfat_dentry_clsf_t type, exfat_dentry_t **d);
 
-extern int exfat_directory_read_file(exfat_directory_t *di, char *name, exfat_file_dentry_t *df,
-    exfat_stream_dentry_t *ds);
+extern int exfat_directory_read_file(exfat_directory_t *di, char *name, 
+    size_t size, exfat_file_dentry_t *df, exfat_stream_dentry_t *ds);