/* -*-c-*-
*
- * $Id: selbuf.c,v 1.1 1999/05/14 21:01:15 mdw Exp $
+ * $Id: selbuf.c,v 1.3 1999/05/22 13:41:00 mdw Exp $
*
* Line-buffering select handler
*
/*----- Revision history --------------------------------------------------*
*
* $Log: selbuf.c,v $
+ * Revision 1.3 1999/05/22 13:41:00 mdw
+ * Fix end-of-file detection and error handling.
+ *
+ * Revision 1.2 1999/05/17 20:36:50 mdw
+ * Make the magical constants for the buffer flags uppercase.
+ *
* Revision 1.1 1999/05/14 21:01:15 mdw
* Integrated `select' handling bits from the background resolver project.
*
void selbuf_enable(selbuf *b)
{
- if (!(b->b.f & lbuf_enable)) {
- b->b.f |= lbuf_enable;
+ if (!(b->b.f & LBUF_ENABLE)) {
+ b->b.f |= LBUF_ENABLE;
sel_addfile(&b->reader);
lbuf_flush(&b->b, 0, 0);
}
void selbuf_disable(selbuf *b)
{
- if (b->b.f & lbuf_enable) {
- b->b.f &= ~lbuf_enable;
+ if (b->b.f & LBUF_ENABLE) {
+ b->b.f &= ~LBUF_ENABLE;
sel_rmfile(&b->reader);
}
}
int n;
sz = lbuf_free(&b->b, &p);
-again:
n = read(fd, p, sz);
- if (n <= 0) {
- switch (errno) {
- case EINTR:
- goto again;
- case EAGAIN:
+ if (n == 0)
+ lbuf_close(&b->b);
+ else if (n > 0)
+ lbuf_flush(&b->b, p, n);
+ else switch (errno) {
+ case EINTR:
+ case EAGAIN:
#if EAGAIN != EWOULDBLOCK
- case EWOULDBLOCK:
+ case EWOULDBLOCK:
#endif
- return;
- default:
- lbuf_close(&b->b);
- }
+ return;
+ default:
+ lbuf_close(&b->b);
}
- else
- lbuf_flush(&b->b, p, n);
}
/* --- @selbuf_init@ --- *
void *p)
{
lbuf_init(&b->b, func, p);
- b->b.f &= ~lbuf_enable;
+ b->b.f &= ~LBUF_ENABLE;
sel_initfile(s, &b->reader, fd, SEL_READ, selbuf_read, b);
selbuf_enable(b);
}