#include <lber.h>
#include <ldif.h>
#include <lutil.h>
+#include <lutil_meter.h>
+#include <sys/stat.h>
#include "slapcommon.h"
int match;
int checkvals;
- int lineno, nextline;
+ int lineno, nextline, ldifrc;
int lmax;
int rc = EXIT_SUCCESS;
int manage = 0;
+ int enable_meter = 0;
+ lutil_meter_t meter;
+ struct stat stat_buf;
+
/* default "000" */
csnsid = 0;
+ if ( isatty (2) ) enable_meter = 1;
slap_tool_init( progname, SLAPADD, argc, argv );
memset( &opbuf, 0, sizeof(opbuf) );
}
}
+ if ( enable_meter
+#ifdef LDAP_DEBUG
+ /* tools default to "none" */
+ && slap_debug == LDAP_DEBUG_NONE
+#endif
+ && !fstat ( fileno ( ldiffp->fp ), &stat_buf )
+ && S_ISREG(stat_buf.st_mode) ) {
+ enable_meter = !lutil_meter_open(
+ &meter,
+ &lutil_meter_text_display,
+ &lutil_meter_linear_estimator,
+ stat_buf.st_size);
+ } else {
+ enable_meter = 0;
+ }
+
/* nextline is the line number of the end of the current entry */
- for( lineno=1; ldif_read_record( ldiffp, &nextline, &buf, &lmax );
- lineno=nextline+1 ) {
+ for( lineno=1; ( ldifrc = ldif_read_record( ldiffp, &nextline, &buf, &lmax )) > 0;
+ lineno=nextline+1 )
+ {
+ BackendDB *bd;
Entry *e;
if ( lineno < jumpline )
e = str2entry2( buf, checkvals );
+ if ( enable_meter )
+ lutil_meter_update( &meter,
+ ftell( ldiffp->fp ),
+ 0);
+
/*
* Initialize text buffer
*/
/* make sure the DN is not empty */
if( BER_BVISEMPTY( &e->e_nname ) &&
- !BER_BVISEMPTY( be->be_nsuffix )) {
- fprintf( stderr, "%s: empty dn=\"%s\" (line=%d)\n",
- progname, e->e_dn, lineno );
+ !BER_BVISEMPTY( be->be_nsuffix ))
+ {
+ fprintf( stderr, "%s: line %d: "
+ "cannot add entry with empty dn=\"%s\"",
+ progname, lineno, e->e_dn );
+ bd = select_backend( &e->e_nname, nosubordinates );
+ if ( bd ) {
+ BackendDB *bdtmp;
+ int dbidx = 0;
+ LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+ if ( bdtmp == bd ) break;
+ dbidx++;
+ }
+
+ assert( bdtmp != NULL );
+
+ fprintf( stderr, "; did you mean to use database #%d (%s)?",
+ dbidx,
+ bd->be_suffix[0].bv_val );
+
+ }
+ fprintf( stderr, "\n" );
rc = EXIT_FAILURE;
entry_free( e );
if( continuemode ) continue;
}
/* check backend */
- if( select_backend( &e->e_nname, nosubordinates )
- != be )
- {
+ bd = select_backend( &e->e_nname, nosubordinates );
+ if ( bd != be ) {
fprintf( stderr, "%s: line %d: "
- "database (%s) not configured to hold \"%s\"\n",
+ "database #%d (%s) not configured to hold \"%s\"",
progname, lineno,
- be ? be->be_suffix[0].bv_val : "<none>",
+ dbnum,
+ be->be_suffix[0].bv_val,
e->e_dn );
- fprintf( stderr, "%s: line %d: "
- "database (%s) not configured to hold \"%s\"\n",
- progname, lineno,
- be ? be->be_nsuffix[0].bv_val : "<none>",
- e->e_ndn );
+ if ( bd ) {
+ BackendDB *bdtmp;
+ int dbidx = 0;
+ LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+ if ( bdtmp == bd ) break;
+ dbidx++;
+ }
+
+ assert( bdtmp != NULL );
+
+ fprintf( stderr, "; did you mean to use database #%d (%s)?",
+ dbidx,
+ bd->be_suffix[0].bv_val );
+
+ } else {
+ fprintf( stderr, "; no database configured for that naming context" );
+ }
+ fprintf( stderr, "\n" );
rc = EXIT_FAILURE;
entry_free( e );
if( continuemode ) continue;
entry_free( e );
}
+ if ( ldifrc < 0 )
+ rc = EXIT_FAILURE;
+
bvtext.bv_len = textlen;
bvtext.bv_val = textbuf;
bvtext.bv_val[0] = '\0';
+ if ( enable_meter ) {
+ lutil_meter_update( &meter, ftell( ldiffp->fp ), 1);
+ lutil_meter_close( &meter );
+ }
+
if ( rc == EXIT_SUCCESS && update_ctxcsn && !dryrun && sid != SLAP_SYNC_SID_MAX + 1 ) {
ctxcsn_id = be->be_dn2id_get( be, be->be_nsuffix );
if ( ctxcsn_id == NOID ) {
ch_free( buf );
if ( !dryrun ) {
+ if ( enable_meter ) {
+ fprintf( stderr, "Closing DB..." );
+ }
if( be->be_entry_close( be ) ) {
rc = EXIT_FAILURE;
}
if( be->be_sync ) {
be->be_sync( be );
}
+ if ( enable_meter ) {
+ fprintf( stderr, "\n" );
+ }
}
if ( slap_tool_destroy())