/* result.c - shell backend result reading function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include <stdio.h>
+#include <ac/errno.h>
#include <ac/string.h>
#include <ac/socket.h>
+#include <ac/unistd.h>
#include "slap.h"
#include "shell.h"
-extern Entry *str2entry();
-
int
read_and_send_results(
- Backend *be,
- Connection *conn,
Operation *op,
- FILE *fp,
- char **attrs,
- int attrsonly
-)
+ SlapReply *rs,
+ FILE *fp )
{
int bsize, len;
char *buf, *bp;
char line[BUFSIZ];
- Entry *e;
- int err;
- char *matched, *info;
/* read in the result and send it along */
buf = (char *) ch_malloc( BUFSIZ );
buf[0] = '\0';
bsize = BUFSIZ;
bp = buf;
- while ( fgets( line, sizeof(line), fp ) != NULL ) {
+ while ( !feof(fp) ) {
+ errno = 0;
+ if ( fgets( line, sizeof(line), fp ) == NULL ) {
+ if ( errno == EINTR ) continue;
+
+ Debug( LDAP_DEBUG_ANY, "shell: fgets failed: %s (%d)\n",
+ strerror(errno), errno, 0 );
+ break;
+ }
+
Debug( LDAP_DEBUG_SHELL, "shell search reading line (%s)\n",
line, 0, 0 );
+
+ /* ignore lines beginning with # (LDIFv1 comments) */
+ if ( *line == '#' ) {
+ continue;
+ }
+
/* ignore lines beginning with DEBUG: */
if ( strncasecmp( line, "DEBUG:", 6 ) == 0 ) {
continue;
}
+
len = strlen( line );
while ( bp + len - buf > bsize ) {
+ size_t offset = bp - buf;
bsize += BUFSIZ;
buf = (char *) ch_realloc( buf, bsize );
+ bp = &buf[offset];
}
strcpy( bp, line );
bp += len;
break;
}
- if ( (e = str2entry( buf )) == NULL ) {
+ if ( (rs->sr_entry = str2entry( buf )) == NULL ) {
Debug( LDAP_DEBUG_ANY, "str2entry(%s) failed\n",
buf, 0, 0 );
} else {
- send_search_entry( be, conn, op, e, attrs,
- attrsonly );
- entry_free( e );
+ rs->sr_attrs = op->oq_search.rs_attrs;
+ send_search_entry( op, rs );
+ entry_free( rs->sr_entry );
}
bp = buf;
}
}
- (void) str2result( buf, &err, &matched, &info );
+ (void) str2result( buf, &rs->sr_err, (char **)&rs->sr_matched, (char **)&rs->sr_text );
/* otherwise, front end will send this result */
- if ( err != 0 || op->o_tag != LDAP_REQ_BIND ) {
- send_ldap_result( conn, op, err, matched, info );
+ if ( rs->sr_err != 0 || op->o_tag != LDAP_REQ_BIND ) {
+ send_ldap_result( op, rs );
}
free( buf );
- return( err );
+ return( rs->sr_err );
}
void
{
int i;
- for ( i = 0; be->be_suffix[i] != NULL; i++ ) {
- fprintf( fp, "suffix: %s\n", be->be_suffix[i] );
+ for ( i = 0; be->be_suffix[i].bv_val != NULL; i++ ) {
+ fprintf( fp, "suffix: %s\n", be->be_suffix[i].bv_val );
}
}