1 files changed, 53 insertions, 62 deletions

diff --git a/lib/microtar/src/microtar-rockbox.c b/lib/microtar/src/microtar-rockbox.c
index 04ba93cc42..d0f579fefb 100644
--- a/lib/microtar/src/microtar-rockbox.c
+++ b/lib/microtar/src/microtar-rockbox.c
@@ -20,81 +20,72 @@
  ****************************************************************************/
 
 #include "file.h"
-#include "microtar.h"
+#include "microtar-rockbox.h"
 #include <stdint.h>
 
-static int fd_write(mtar_t *tar, const void *data, unsigned size) {
-  intptr_t fd = (intptr_t)tar->stream;
-  ssize_t res = write(fd, data, size);
-  if(res < 0 || ((unsigned)res != size))
-    return MTAR_EWRITEFAIL;
-  else
-    return MTAR_ESUCCESS;
-}
+static int fd_read(void* stream, void* data, unsigned size)
+{
+    ssize_t res = read((intptr_t)stream, data, size);
+    if(res < 0)
+        return MTAR_EREADFAIL;
 
-static int fd_read(mtar_t *tar, void *data, unsigned size) {
-  intptr_t fd = (intptr_t)tar->stream;
-  ssize_t res = read(fd, data, size);
-  if(res < 0 || ((unsigned)res != size))
-    return MTAR_EREADFAIL;
-  else
-    return MTAR_ESUCCESS;
+    return res;
 }
 
-static int fd_seek(mtar_t *tar, unsigned offset) {
-  intptr_t fd = (intptr_t)tar->stream;
-  off_t res = lseek(fd, offset, SEEK_SET);
-  if(res < 0 || ((unsigned)res != offset))
-    return MTAR_ESEEKFAIL;
-  else
-    return MTAR_ESUCCESS;
-}
+static int fd_write(void* stream, const void* data, unsigned size)
+{
+    ssize_t res = write((intptr_t)stream, data, size);
+    if(res < 0)
+        return MTAR_EWRITEFAIL;
 
-static int fd_close(mtar_t *tar) {
-  intptr_t fd = (intptr_t)tar->stream;
-  close(fd);
-  return MTAR_ESUCCESS;
+    return res;
 }
 
+static int fd_seek(void* stream, unsigned offset)
+{
+    off_t res = lseek((intptr_t)stream, offset, SEEK_SET);
+    if(res < 0 || ((unsigned)res != offset))
+        return MTAR_ESEEKFAIL;
+    else
+        return MTAR_ESUCCESS;
+}
 
-int mtar_open(mtar_t *tar, const char *filename, const char *mode) {
-  int err;
-  int openmode;
-  int fd;
-
-  /* Init tar struct and functions */
-  memset(tar, 0, sizeof(*tar));
-  tar->write = fd_write;
-  tar->read = fd_read;
-  tar->seek = fd_seek;
-  tar->close = fd_close;
+static int fd_close(void* stream)
+{
+    close((intptr_t)stream);
+    return MTAR_ESUCCESS;
+}
 
-  /* Get correct mode flags */
-  if ( strchr(mode, 'r') )
-      openmode = O_RDONLY;
-  else if ( strchr(mode, 'w') )
-      openmode = O_CREAT|O_TRUNC|O_WRONLY;
-  else if ( strchr(mode, 'a') )
-      openmode = O_WRONLY|O_APPEND;
-  else
-      return MTAR_EFAILURE;
+static const mtar_ops_t fd_ops = {
+    .read = fd_read,
+    .write = fd_write,
+    .seek = fd_seek,
+    .close = fd_close,
+};
 
-  /* Open file */
-  fd = open(filename, openmode);
-  if(fd < 0)
-    return MTAR_EOPENFAIL;
+int mtar_open(mtar_t* tar, const char* filename, int flags)
+{
+    /* Determine access mode */
+    int access;
+    switch(flags & O_ACCMODE) {
+    case O_RDONLY:
+        access = MTAR_READ;
+        break;
 
-  tar->stream = (void*)(intptr_t)fd;
+    case O_WRONLY:
+        access = MTAR_WRITE;
+        break;
 
-  /* Read first header to check it is valid if mode is `r` */
-  if ( openmode & O_RDONLY ) {
-    err = mtar_read_header(tar, &tar->header);
-    if (err != MTAR_ESUCCESS) {
-      mtar_close(tar);
-      return err;
+    default:
+        /* Note - O_RDWR isn't very useful so we don't allow it */
+        return MTAR_EAPI;
     }
-  }
 
-  /* Return ok */
-  return MTAR_ESUCCESS;
+    int fd = open(filename, flags);
+    if(fd < 0)
+        return MTAR_EOPENFAIL;
+
+    /* Init tar struct and functions */
+    mtar_init(tar, access, &fd_ops, (void*)(intptr_t)fd);
+    return MTAR_ESUCCESS;
 }