- struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info;
- struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
- int cmp=0;
-
- logf (LOG_DEBUG, "rsbool_forward '%s' (ct=%p rfd=%p m=%d,%d)",
- ct->control->desc, ct, rfd, p->more_l, p->more_r);
- if ( p->more_l)
- p->more_l = rset_forward(info->rset_l, p->rfd_l, p->buf_l,
- &p->term_index_l, info->cmp, untilbuf);
- if ( p->more_r)
- p->more_r = rset_forward(info->rset_r, p->rfd_r, p->buf_r,
- &p->term_index_r, info->cmp, untilbuf);
- if (p->more_l && p->more_r)
- cmp = (*info->cmp)(p->buf_l, p->buf_r);
- else if (p->more_l)
- cmp = -2;
- else
- cmp = 2;
- if ( (cmp<0) && (p->more_l) )
- {
- memcpy (buf, p->buf_l, info->key_size);
- *term_index = p->term_index_l;
- } else if ( (cmp>0) && (p->more_r) )
- {
- memcpy (buf, p->buf_r, info->key_size);
- *term_index = p->term_index_r + info->term_index_s;
- }
- return ( p->more_l || p->more_r);
-}
-
-static int r_count (RSET ct)
-{
- return 0;
+ struct rset_bool_info *info = (struct rset_bool_info*)(rfd->rset->priv);
+ struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
+ int rc;
+
+ if ( p->more_l && ((cmpfunc)(untilbuf,p->buf_l)==2) )
+ p->more_l = rset_forward(p->rfd_l, p->buf_l,
+ info->cmp, untilbuf);
+ if ( p->more_r && ((cmpfunc)(untilbuf,p->buf_r)==2))
+ p->more_r = rset_forward(p->rfd_r, p->buf_r,
+ info->cmp, untilbuf);
+ p->tail=0;
+ rc = rset_read(rfd,buf);
+ return rc;