Changeset 3667:cfe93dbf0bdb in roaraudio for libroaross

Timestamp:

04/05/10 11:49:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support static files with fopen()

File:

• libroaross/libroaross.c (modified) (3 diffs)

libroaross/libroaross.c

@@ -1348 +1348 @@
 //roar_vio_to_stdio
 
+static int _vio_close    (struct roar_vio_calls * vio) {
+ int ret = 0;
+
+ if ( roar_vio_get_fh(vio) != -1 )
+  ret = close(roar_vio_get_fh(vio));
+
+ roar_mm_free(vio);
+
+ return ret;
+}
+
 FILE *fopen(const char *path, const char *mode) {
+ struct roar_vio_calls * vio;
  struct pointer * pointer;
  FILE  * fr;
@@ -1398 +1410 @@
    break;
   default:       // return successfully opened pointer to caller
+#if 0
     if ( (pointer = _get_pointer_by_fh(ret)) != NULL ) {
      if ( (fr = roar_vio_to_stdio(&(pointer->handle->stream_vio), flags)) == NULL ) {
@@ -1409 +1422 @@
      return NULL;
     }
+#endif
+    if ( (vio = roar_mm_malloc(sizeof(struct roar_vio_calls))) == NULL ) {
+     return NULL; // errno should be set correctly by roar_mm_malloc().
+    }
+
+    roar_vio_init_calls(vio);  // TODO: add error handling.
+    roar_vio_set_fh(vio, ret); // TODO: add error handling.
+    vio->close = _vio_close;
+    if ( (fr = roar_vio_to_stdio(vio, flags)) == NULL ) {
+     _vio_close(vio);
+     errno = EIO;
+     return NULL;
+    } else {
+     return fr;
+    }
    break;
  }