Changeset 73b1218 in mainline

Timestamp:

2011-07-16T18:56:58Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1f78546

Parents:

27678a0

Message:

exFAT: exfat_directory_read_file function for rading file names from
exFAT directory

Location:

uspace/srv/fs/exfat

Files:

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

uspace/srv/fs/exfat/exfat_directory.c

@@ -179 +179 @@
 }
 
+
+int exfat_directory_read_file(exfat_directory_t *di, char *name, exfat_file_dentry_t *df, exfat_stream_dentry_t *ds)
+{
+        uint16_t wname[EXFAT_FILENAME_LEN+1];
+        exfat_dentry_t *d = NULL;
+        int rc, i;
+        size_t offset = 0;
+        
+        rc = exfat_directory_find(di, EXFAT_DENTRY_FILE, &d);
+        if (rc != EOK)
+                return rc;
+        *df = d->file;
+
+        rc = exfat_directory_next(di);
+        if (rc != EOK)
+                return rc;
+        rc = exfat_directory_get(di, &d); 
+        if (rc != EOK)
+                return rc;
+        if (exfat_classify_dentry(d) != EXFAT_DENTRY_STREAM)
+                return ENOENT;
+        *ds  = d->stream;
+/*      
+        if (ds->name_size > EXFAT_FILENAME_LEN)
+                return EOVERFLOW;
+*/
+        for (i=0; i<df->count-1; i++) {
+                rc = exfat_directory_next(di);
+                if (rc != EOK)
+                        return rc;
+                rc = exfat_directory_get(di, &d); 
+                if (rc != EOK)
+                        return rc;
+                if (exfat_classify_dentry(d) != EXFAT_DENTRY_NAME)
+                        return ENOENT;
+                exfat_dentry_get_name(&d->name, ds->name_size, wname, &offset);
+        }
+        rc = utf16_to_str(name, EXFAT_FILENAME_LEN, wname);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+
 /**
  * @}

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_expand(exfat_directory_t *di);
 extern int exfat_directory_lookup_free(exfat_directory_t *di, size_t count);