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;
die("%s: Line too long", f->name);
}
+int
+bgets_nodie(struct fastbuf *f, byte *b, uns l)
+{
+ byte *start = b;
+ byte *e = b + l - 1;
+ int k;
+
+ 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;
+}
+
byte *
bgets0(struct fastbuf *f, byte *b, uns l)
{
int k;
k = bgetc(f);
- if (k == EOF)
+ if (k < 0)
return NULL;
while (b < e)
{
- if (!k || k == EOF)
+ if (k <= 0)
{
*b = 0;
return b;
favail = bdirect_read_prepare(f, &fptr);
if (!favail)
- die("bbcopy: source exhausted");
+ {
+ if (l == ~0U)
+ return;
+ 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;
+ if (l != ~0U)
+ l -= n;
}
}