#endif
#include <string.h>
#include <errno.h>
+#include "imageri.h"
#define IOL_DEB(x)
off_t cpos; /* Offset within the current */
} io_ex_buffer;
-static void io_obj_setp_buffer(io_obj *io, char *p, size_t len, closebufp closecb, void *closedata);
-static void io_obj_setp_cb2 (io_obj *io, void *p, readl readcb, writel writecb, seekl seekcb, closel closecb, destroyl destroycb);
+static void io_obj_setp_buffer(io_obj *io, char *p, size_t len, i_io_closebufp_t closecb, void *closedata);
+static void io_obj_setp_cb2 (io_obj *io, void *p, i_io_readl_t readcb, i_io_writel_t writecb, i_io_seekl_t seekcb, i_io_closel_t closecb, i_io_destroyl_t destroycb);
+/* turn current offset, file length, whence and offset into a new offset */
+#define calc_seek_offset(curr_off, length, offset, whence) \
+ (((whence) == SEEK_SET) ? (offset) : \
+ ((whence) == SEEK_CUR) ? (curr_off) + (offset) : \
+ ((whence) == SEEK_END) ? (length) + (offset) : -1)
/*
=head1 NAME
static ssize_t fd_read(io_glue *ig, void *buf, size_t count);
static ssize_t fd_write(io_glue *ig, const void *buf, size_t count);
static off_t fd_seek(io_glue *ig, off_t offset, int whence);
-static void fd_close(io_glue *ig);
+static int fd_close(io_glue *ig);
static ssize_t fd_size(io_glue *ig);
static const char *my_strerror(int err);
size_t bc = 0;
char *cbuf = buf;
- IOL_DEB( printf("realseek_read: fd = %d, ier->cpos = %ld, buf = %p, "
- "count = %d\n", fd, (long) ier->cpos, buf, count) );
+ IOL_DEB( printf("realseek_read: buf = %p, count = %d\n",
+ buf, count) );
/* Is this a good idea? Would it be better to handle differently?
skip handling? */
while( count!=bc && (rc = ig->source.cb.readcb(p,cbuf+bc,count-bc))>0 ) {
ier->cpos += bc;
IOL_DEB( printf("realseek_read: rc = %d, bc = %d\n", rc, bc) );
- return bc;
+ return rc < 0 ? rc : bc;
}
ier->cpos += bc;
IOL_DEB( printf("realseek_write: rc = %d, bc = %d\n", rc, bc) );
- return bc;
+ return rc < 0 ? rc : bc;
}
=cut */
static
-void
+int
realseek_close(io_glue *ig) {
mm_log((1, "realseek_close(ig %p)\n", ig));
if (ig->source.cb.closecb)
- ig->source.cb.closecb(ig->source.cb.p);
+ return ig->source.cb.closecb(ig->source.cb.p);
+ else
+ return 0;
}
buffer_read(io_glue *ig, void *buf, size_t count) {
io_ex_buffer *ieb = ig->exdata;
- IOL_DEB( printf("buffer_read: fd = %d, ier->cpos = %ld, buf = %p, count = %d\n", fd, (long) ier->cpos, buf, count) );
+ IOL_DEB( printf("buffer_read: ieb->cpos = %ld, buf = %p, count = %d\n", (long) ieb->cpos, buf, count) );
if ( ieb->cpos+count > ig->source.buffer.len ) {
mm_log((1,"buffer_read: short read: cpos=%d, len=%d, count=%d\n", ieb->cpos, ig->source.buffer.len));
memcpy(buf, ig->source.buffer.data+ieb->cpos, count);
ieb->cpos += count;
- IOL_DEB( printf("buffer_read: rc = %d, count = %d\n", rc, count) );
+ IOL_DEB( printf("buffer_read: count = %d\n", count) );
return count;
}
*/
static
-void
+int
buffer_close(io_glue *ig) {
mm_log((1, "buffer_close(ig %p)\n", ig));
- /* FIXME: Do stuff here */
+
+ return 0;
}
off_t
buffer_seek(io_glue *ig, off_t offset, int whence) {
io_ex_buffer *ieb = ig->exdata;
- off_t reqpos = offset
- + (whence == SEEK_CUR)*ieb->cpos
- + (whence == SEEK_END)*ig->source.buffer.len;
+ off_t reqpos =
+ calc_seek_offset(ieb->cpos, ig->source.buffer.len, offset, whence);
if (reqpos > ig->source.buffer.len) {
mm_log((1, "seeking out of readable range\n"));
return (off_t)-1;
}
+ if (reqpos < 0) {
+ i_push_error(0, "seek before beginning of file");
+ return (off_t)-1;
+ }
ieb->cpos = reqpos;
IOL_DEB( printf("buffer_seek(ig %p, offset %ld, whence %d)\n", ig, (long) offset, whence) );
*/
static
-void
+int
bufchain_close(io_glue *ig) {
mm_log((1, "bufchain_close(ig %p)\n",ig));
IOL_DEB( printf("bufchain_close(ig %p)\n", ig) );
- /* FIXME: Commit a seek point here */
-
+
+ return 0;
}
off_t
bufchain_seek(io_glue *ig, off_t offset, int whence) {
io_ex_bchain *ieb = ig->exdata;
- io_blink *ib = NULL;
int wrlen;
- off_t cof = 0;
- off_t scount = offset;
+ off_t scount = calc_seek_offset(ieb->gpos, ieb->length, offset, whence);
off_t sk;
mm_log((1, "bufchain_seek(ig %p, offset %ld, whence %d)\n", ig, offset, whence));
- switch (whence) {
- case SEEK_SET: /* SEEK_SET = 0, From the top */
- ieb->cp = ieb->head;
- ieb->cpos = 0;
- ieb->gpos = 0;
-
- while( scount ) {
- int clen = (ieb->cp == ieb->tail) ? ieb->tfill : ieb->cp->len;
- if (clen == ieb->cpos) {
- if (ieb->cp == ieb->tail) break; /* EOF */
- ieb->cp = ieb->cp->next;
- ieb->cpos = 0;
- clen = (ieb->cp == ieb->tail) ? ieb->tfill : ieb->cp->len;
- }
-
- sk = clen - ieb->cpos;
- sk = sk > scount ? scount : sk;
-
- scount -= sk;
- ieb->cpos += sk;
- ieb->gpos += sk;
- }
+ if (scount < 0) {
+ i_push_error(0, "invalid whence supplied or seek before start of file");
+ return (off_t)-1;
+ }
- wrlen = scount;
-
- if (wrlen > 0) {
- /*
- * extending file - get ieb into consistent state and then
- * call write which will get it to the correct position
- */
- char TB[BBSIZ];
- memset(TB, 0, BBSIZ);
- ieb->gpos = ieb->length;
- ieb->cpos = ieb->tfill;
-
- while(wrlen > 0) {
- ssize_t rc, wl = i_min(wrlen, BBSIZ);
- mm_log((1, "bufchain_seek: wrlen = %d, wl = %d\n", wrlen, wl));
- rc = bufchain_write( ig, TB, wl );
- if (rc != wl) m_fatal(0, "bufchain_seek: Unable to extend file\n");
- wrlen -= rc;
- }
+ ieb->cp = ieb->head;
+ ieb->cpos = 0;
+ ieb->gpos = 0;
+
+ while( scount ) {
+ int clen = (ieb->cp == ieb->tail) ? ieb->tfill : ieb->cp->len;
+ if (clen == ieb->cpos) {
+ if (ieb->cp == ieb->tail) break; /* EOF */
+ ieb->cp = ieb->cp->next;
+ ieb->cpos = 0;
+ clen = (ieb->cp == ieb->tail) ? ieb->tfill : ieb->cp->len;
}
- break;
-
- case SEEK_CUR:
- m_fatal(123, "SEEK_CUR IS NOT IMPLEMENTED\n");
-
- /*
- case SEEK_CUR:
- ib = ieb->cp;
- if (cof < 0) {
- cof += ib->cpos;
- cpos = 0;
- while(cof < 0 && ib->prev) {
- ib = ib->prev;
- cof += ib->len;
- }
- */
+ sk = clen - ieb->cpos;
+ sk = sk > scount ? scount : sk;
- case SEEK_END: /* SEEK_END = 2 */
- if (cof>0) m_fatal(0, "bufchain_seek: SEEK_END + %d : Extending files via seek not supported!\n", cof);
+ scount -= sk;
+ ieb->cpos += sk;
+ ieb->gpos += sk;
+ }
+
+ wrlen = scount;
- ieb->cp = ieb->tail;
+ if (wrlen > 0) {
+ /*
+ * extending file - get ieb into consistent state and then
+ * call write which will get it to the correct position
+ */
+ char TB[BBSIZ];
+ memset(TB, 0, BBSIZ);
+ ieb->gpos = ieb->length;
ieb->cpos = ieb->tfill;
- if (cof<0) {
- cof += ieb->cpos;
- ieb->cpos = 0;
-
- while(cof<0 && ib->prev) {
- ib = ib->prev;
- cof += ib->len;
- }
-
- if (cof<0) m_fatal(0, "bufchain_seek: Tried to seek before start of file\n");
- ieb->gpos = ieb->length+offset;
- ieb->cpos = cof;
+ while(wrlen > 0) {
+ ssize_t rc, wl = i_min(wrlen, BBSIZ);
+ mm_log((1, "bufchain_seek: wrlen = %d, wl = %d\n", wrlen, wl));
+ rc = bufchain_write( ig, TB, wl );
+ if (rc != wl) i_fatal(0, "bufchain_seek: Unable to extend file\n");
+ wrlen -= rc;
}
- break;
- default:
- m_fatal(0, "bufchain_seek: Unhandled seek request: whence = %d\n", whence );
}
mm_log((2, "bufchain_seek: returning ieb->gpos = %d\n", ieb->gpos));
*/
static void
-io_obj_setp_buffer(io_obj *io, char *p, size_t len, closebufp closecb,
+io_obj_setp_buffer(io_obj *io, char *p, size_t len, i_io_closebufp_t closecb,
void *closedata) {
io->buffer.type = BUFFER;
io->buffer.data = p;
*/
static void
-io_obj_setp_cb2(io_obj *io, void *p, readl readcb, writel writecb, seekl seekcb, closel closecb, destroyl destroycb) {
+io_obj_setp_cb2(io_obj *io, void *p, i_io_readl_t readcb, i_io_writel_t writecb, i_io_seekl_t seekcb, i_io_closel_t closecb, i_io_destroyl_t destroycb) {
io->cb.type = CBSEEK;
io->cb.p = p;
io->cb.readcb = readcb;
*/
io_glue *
-io_new_buffer(char *data, size_t len, closebufp closecb, void *closedata) {
+io_new_buffer(char *data, size_t len, i_io_closebufp_t closecb, void *closedata) {
io_glue *ig;
io_ex_buffer *ieb = mymalloc(sizeof(io_ex_buffer));
return ig;
}
-io_glue *io_new_cb(void *p, readl readcb, writel writecb, seekl seekcb,
- closel closecb, destroyl destroycb) {
+io_glue *io_new_cb(void *p, i_io_readl_t readcb, i_io_writel_t writecb,
+ i_io_seekl_t seekcb, i_io_closel_t closecb,
+ i_io_destroyl_t destroycb) {
io_glue *ig;
io_ex_rseek *ier = mymalloc(sizeof(io_ex_rseek));
io_type inn = ig->source.type;
if ( inn != BUFCHAIN ) {
- m_fatal(0, "io_slurp: called on a source that is not from a bufchain\n");
+ i_fatal(0, "io_slurp: called on a source that is not from a bufchain\n");
}
ieb = ig->exdata;
rc = bufchain_read(ig, cc, ieb->length);
if (rc != ieb->length)
- m_fatal(1, "io_slurp: bufchain_read returned an incomplete read: rc = %d, request was %d\n", rc, ieb->length);
+ i_fatal(1, "io_slurp: bufchain_read returned an incomplete read: rc = %d, request was %d\n", rc, ieb->length);
return rc;
}
return result;
}
-static void fd_close(io_glue *ig) {
+static int fd_close(io_glue *ig) {
/* no, we don't close it */
+ return 0;
}
static ssize_t fd_size(io_glue *ig) {
void
io_glue_destroy(io_glue *ig) {
- io_type inn = ig->source.type;
mm_log((1, "io_glue_DESTROY(ig %p)\n", ig));
if (ig->destroycb)
projects / imager.git / blobdiff