cleanup option parsing

This commit is contained in:
Pierangelo Masarati 2010-09-07 05:45:36 +00:00
parent c405143a0a
commit 34f4f38acc

View file

@ -108,7 +108,7 @@ usage( int tool, const char *progname )
}
static int
parse_slapopt( void )
parse_slapopt( int tool, int *mode )
{
size_t len = 0;
char *p;
@ -424,7 +424,7 @@ slap_tool_init(
break;
case 'o':
if ( parse_slapopt() ) {
if ( parse_slapopt( tool, &mode ) ) {
usage( tool, progname );
}
break;
@ -457,11 +457,20 @@ slap_tool_init(
}
break;
case 's': /* dump subtree */
if ( tool == SLAPADD )
case 's':
switch ( tool ) {
case SLAPADD:
case SLAPMODIFY:
/* no schema check */
mode |= SLAP_TOOL_NO_SCHEMA_CHECK;
else if ( tool == SLAPCAT || tool == SLAPSCHEMA )
break;
case SLAPCAT:
case SLAPSCHEMA:
/* dump subtree */
subtree = ch_strdup( optarg );
break;
}
break;
case 't': /* turn on truncate */