-/* $Id: rset.c,v 1.31 2004-09-01 15:01:32 heikki Exp $
+/* $Id: rset.c,v 1.34 2004-10-15 10:07:34 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
RSET rset_create_base(const struct rset_control *sel,
- NMEM nmem, const struct key_control *kcontrol)
- /* FIXME - Add keysize and cmp function */
- /* FIXME - Add a general key-func block for cmp, dump, etc */
+ NMEM nmem, const struct key_control *kcontrol,
+ int scope, TERMID term)
{
RSET rnew;
NMEM M;
rnew->priv = 0;
rnew->free_list=NULL;
rnew->keycontrol=kcontrol;
-
+ rnew->scope=scope;
+ rnew->term=term;
return rnew;
}
} /* rset_default_pos */
#endif
-int rset_default_forward(RSFD rfd, void *buf,
+int rset_default_forward(RSFD rfd, void *buf, TERMID *term,
const void *untilbuf)
{
int more=1;
- int cmp=2;
+ int cmp=rfd->rset->scope;
logf (LOG_DEBUG, "rset_default_forward starting '%s' (ct=%p rfd=%p)",
rfd->rset->control->desc, rfd->rset, rfd);
/* key_logdump(LOG_DEBUG, untilbuf); */
- while ( (cmp==2) && (more))
+ while ( (cmp>=rfd->rset->scope) && (more))
{
logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
- more=rset_read(rfd, buf);
+ more=rset_read(rfd, buf, term);
if (more)
cmp=(rfd->rset->keycontrol->cmp)(untilbuf,buf);
/* if (more)