X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/a6ae4dd126e7b2b678e0db31b68bba51311282cc..81d9da9a3ab660a3ce6ac1f1660024f2b77dfc95:/src/lbx.h

diff --git a/src/lbx.h b/src/lbx.h
index a788318..a7be058 100644
--- a/src/lbx.h
+++ b/src/lbx.h
@@ -3,16 +3,6 @@
 
 #include <stdio.h>
 
-/* Errors */
-enum {
-	LBX_ESUCCESS,
-	LBX_EMAGIC,
-	LBX_EEOF,
-	LBX_ERANGE,
-	LBX_EFORMAT,
-};
-extern int lbx_errno;
-
 struct lbx_file_ops {
 	size_t (*read)(void *buf, size_t size, void *handle);
 	int    (*seek)(void *handle, long offset, int whence);
@@ -31,8 +21,16 @@ extern const struct lbx_file_ops lbx_default_fops;
 /* I/O operations for un-seekable files (e.g. pipes). */
 extern const struct lbx_file_ops lbx_pipe_fops;
 
+/* I/O operations for LBX archive members. */
+extern const struct lbx_file_ops lbx_arch_fops;
+
 /* Opaque */
-typedef struct lbx_state LBX;
+typedef struct lbx LBX;
+typedef struct lbx_file_state LBXfile;
+
+struct lbx {
+	unsigned nfiles;
+};
 
 struct lbx_statbuf {
 	const char *name;
@@ -42,16 +40,18 @@ struct lbx_statbuf {
 /* Archive operations */
 LBX   *lbx_open(void *handle, const struct lbx_file_ops *fops,
                 int (*destructor)(void *handle), const char *name);
-LBX   *lbx_fopen(FILE *, const char *);
+LBX   *lbx_fopen(const char *);
 LBX   *lbx_mopen(void *, size_t, const char *);
 int    lbx_close(LBX *);
 size_t lbx_numfiles(LBX *);
 
 /* File operations */
-int    lbx_stat(LBX *, size_t, struct lbx_statbuf *);
-size_t lbx_extract(LBX *, size_t, FILE *);
-
-/* Misc operations */
-const char *lbx_strerror(void);
+int      lbx_file_stat(LBX *lbx, unsigned fileno, struct lbx_statbuf *out);
+LBXfile *lbx_file_open(LBX *lbx, unsigned fileno);
+size_t   lbx_file_read(LBXfile *f, void *buf, size_t n);
+int      lbx_file_seek(LBXfile *f, long offset, int whence);
+long     lbx_file_tell(LBXfile *f);
+int      lbx_file_eof(LBXfile *f);
+void     lbx_file_close(LBXfile *f);
 
 #endif