* Sherlock Library -- Fast Buffered I/O
*
* (c) 1997--2000 Martin Mares <mj@ucw.cz>
+ *
+ * This software may be freely distributed and used according to the terms
+ * of the GNU Lesser General Public License.
*/
#include "lib/lib.h"
#include "lib/fastbuf.h"
-#include <stdio.h>
#include <stdlib.h>
void bclose(struct fastbuf *f)
if (f)
{
bflush(f);
- f->close(f);
- xfree(f);
+ if (f->close)
+ f->close(f);
}
}
void bflush(struct fastbuf *f)
{
- if (f->bptr != f->buffer)
- { /* Have something to flush */
- if (f->bstop > f->buffer) /* Read data? */
- {
- f->bptr = f->bstop = f->buffer;
- f->pos = f->fdpos;
- }
- else /* Write data... */
- f->spout(f);
- }
+ if (f->bptr > f->bstop)
+ f->spout(f);
+ else if (f->bstop > f->buffer)
+ f->bptr = f->bstop = f->buffer;
}
inline void bsetpos(struct fastbuf *f, sh_off_t pos)
{
- if (pos >= f->pos && (pos <= f->pos + (f->bptr - f->buffer) || pos <= f->pos + (f->bstop - f->buffer)))
- f->bptr = f->buffer + (pos - f->pos);
+ /* We can optimize seeks only when reading */
+ if (pos >= f->pos - (f->bstop - f->buffer) && pos <= f->pos)
+ f->bptr = f->bstop + (pos - f->pos);
else
{
bflush(f);
return *f->bptr;
}
-void bputc_slow(struct fastbuf *f, byte c)
+void bputc_slow(struct fastbuf *f, uns c)
{
if (f->bptr >= f->bufend)
f->spout(f);
*f->bptr++ = c;
}
-word bgetw_slow(struct fastbuf *f)
+int bgetw_slow(struct fastbuf *f)
{
- word w = bgetc_slow(f);
+ int w1, w2;
+ w1 = bgetc_slow(f);
+ if (w1 < 0)
+ return w1;
+ w2 = bgetc_slow(f);
+ if (w2 < 0)
+ return w2;
#ifdef CPU_BIG_ENDIAN
- return (w << 8) | bgetc_slow(f);
+ return (w1 << 8) | w2;
#else
- return w | (bgetc_slow(f) << 8);
+ return w1 | (w2 << 8);
#endif
}
return ((u64) h << 32) | l;
}
-void bputw_slow(struct fastbuf *f, word w)
+void bputw_slow(struct fastbuf *f, uns w)
{
#ifdef CPU_BIG_ENDIAN
bputc_slow(f, w >> 8);
#endif
}
-uns bread_slow(struct fastbuf *f, void *b, uns l)
+uns bread_slow(struct fastbuf *f, void *b, uns l, uns check)
{
uns total = 0;
while (l)
l -= k;
total += k;
}
+ if (check && total && l)
+ die("breadb: short read");
return total;
}
int k;
k = bgetc(f);
- if (k == EOF)
+ if (k < 0)
return NULL;
while (b < e)
{
- if (k == '\n' || k == EOF)
+ if (k == '\n' || k < 0)
{
*b = 0;
return b;
}
int
-bdirect_read(struct fastbuf *f, byte **buf)
+bgets_nodie(struct fastbuf *f, byte *b, uns l)
{
- int len;
+ byte *start = b;
+ byte *e = b + l - 1;
+ int k;
- if (f->bptr == f->bstop && !f->refill(f))
- return EOF;
- *buf = f->bptr;
- len = f->bstop - f->bptr;
- f->bptr += len;
- return len;
+ k = bgetc(f);
+ if (k < 0)
+ return 0;
+ while (b < e)
+ {
+ if (k == '\n' || k < 0)
+ {
+ *b++ = 0;
+ return b - start;
+ }
+ *b++ = k;
+ k = bgetc(f);
+ }
+ return -1;
}
-int
-bdirect_write_prepare(struct fastbuf *f, byte **buf)
+byte *
+bgets0(struct fastbuf *f, byte *b, uns l)
{
- if (f->bptr == f->bufend)
- f->spout(f);
- *buf = f->bptr;
- return f->bufend - f->bptr;
+ byte *e = b + l - 1;
+ int k;
+
+ k = bgetc(f);
+ if (k < 0)
+ return NULL;
+ while (b < e)
+ {
+ if (k <= 0)
+ {
+ *b = 0;
+ return b;
+ }
+ *b++ = k;
+ k = bgetc(f);
+ }
+ die("%s: Line too long", f->name);
}
void
-bdirect_write_commit(struct fastbuf *f, byte *pos)
+bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uns l)
+{
+ while (l)
+ {
+ byte *fptr, *tptr;
+ uns favail, tavail, n;
+
+ favail = bdirect_read_prepare(f, &fptr);
+ if (!favail)
+ die("bbcopy: source exhausted");
+ tavail = bdirect_write_prepare(t, &tptr);
+ n = MIN(l, favail);
+ n = MIN(n, tavail);
+ memcpy(tptr, fptr, n);
+ bdirect_read_commit(f, fptr + n);
+ bdirect_write_commit(t, tptr + n);
+ l -= n;
+ }
+}
+
+int
+bconfig(struct fastbuf *f, uns item, int value)
{
- f->bptr = pos;
+ return f->config ? f->config(f, item, value) : -1;
}