Changeset 1152

Timestamp:

04/24/11 04:01:38 (2 years ago)

Author:

reyalP

Message:

change dryos directory wrappers to allow readdir on multiple directories. May fix some problems with "purge raw" in dryos.

Location:

trunk

Files:

• include/stdlib.h (modified) (2 diffs)
• platform/generic/wrappers.c (modified) (2 diffs)

trunk/include/stdlib.h

@@ -203 +203 @@
 };
 #else
+// NOTE this is not complete and may not be accurate for all versions
 struct dirent {
     char                d_name[13];
@@ -214 +215 @@
 #endif
 
-// NOTE this is NOT the actual structure returned by dryos opendir!
+#if !CAM_DRYOS
 typedef struct {
-    unsigned int        fd; // first member is an fd from Open in dryos
+    unsigned int        fd;
     unsigned int        loc;
     struct dirent       dir;
 } DIR;
-
+#else
+// structure returned by dryos
+// actual size may vary depending on version
+typedef struct {
+    int fh;
+    int unk[4];
+} DIR_dryos;
+
+// struct returned by our wrappers around opendir
+typedef struct {
+    DIR_dryos *dh;
+#ifdef CAM_DRYOS_2_3_R39
+    char de_buf[64];
+#else
+    char de_buf[40];
+#endif
+} DIR;
+#endif
 
 extern DIR*           opendir (const char* name);

trunk/platform/generic/wrappers.c

@@ -362 +362 @@
 }
 
+//----------------------------------------------------------------------------
+// directory wrappers
+#ifndef CAM_DRYOS
 void *opendir(const char* name) {
     return _opendir(name);
 }
-
 void* readdir(void *d) {
-# if !CAM_DRYOS
     return _readdir(d);
-#else
-// TODO this makes a single static buffer for all directory handles.
-// This means you can only use one at a time, unless you memcpy!
-#ifdef CAM_DRYOS_2_3_R39
-  static char de[64];
-#else
-  static char de[40];
-#endif
-
-  _ReadFastDir(d, de);
-  return de[0]? de : (void*)0;
-#endif
-}
-
+}
 int closedir(void *d) {
     return _closedir(d);
@@ -390 +378 @@
     return _rewinddir(d);
 }
+#else // dryos
+// TODO duplicated in stdlib.h!
+// structure returned by dryos
+// actual size may vary depending on version
+typedef struct {
+    int fh;
+    int unk[4];
+} DIR_dryos;
+
+// struct returned by our wrappers around opendir
+typedef struct {
+    DIR_dryos *dh;
+#ifdef CAM_DRYOS_2_3_R39
+    char de_buf[64];
+#else
+    char de_buf[40];
+#endif
+} DIR;
+
+DIR *opendir(const char* name) {
+    DIR *d;
+    DIR_dryos *dh = _opendir(name);
+    if(!dh) {
+        return (void *)0;
+    }
+    d = _malloc(sizeof(DIR));
+    if(!d) {
+        _closedir(dh);
+        return (void *)0;
+    }
+    d->dh = dh;
+    return d;
+}
+
+void* readdir(DIR *d) {
+  _ReadFastDir(d->dh, d->de_buf);
+  return d->de_buf[0]? d->de_buf : (void*)0;
+}
+
+int closedir(DIR *d) {
+    int r;
+    if(!d) {
+        return -1;
+    }
+    r = _closedir(d->dh);
+    _free(d);    
+    return r;
+}
+
+void rewinddir(DIR *d) {
+    if(!d) {
+        return;
+    }
+    _rewinddir(d->dh);
+}
+#endif // dryos dir functions
 
 int stat(char *name, void *pStat) {