xfs-cmds/xfsdump/restore/content.c - diff

Return to content.c CVS log

Up to [OSS] / xfs-cmds / xfsdump / restore

Diff for /xfs-cmds/xfsdump/restore/content.c between versions 1.45 and 1.46

version 1.45, 2006/05/24 06:08:55	version 1.46, 2007/02/01 19:02:45
Line 927 content_init( intgen_t argc, char *argv[	Line 927 content_init( intgen_t argc, char *argv[
if ( ! optarg \|\| optarg[ 0 ] == '-' ) {	if ( ! optarg \|\| optarg[ 0 ] == '-' ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument missing\n"),	"-%c argument missing\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
Line 935 content_init( intgen_t argc, char *argv[	Line 935 content_init( intgen_t argc, char *argv[
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"unable to get status of -%c argument %s:"	"unable to get status of -%c argument %s:"
" %s\n"),	" %s\n"),
optopt,	c,
optarg,	optarg,
strerror( errno ));	strerror( errno ));
return BOOL_FALSE;	return BOOL_FALSE;
Line 953 content_init( intgen_t argc, char *argv[	Line 953 content_init( intgen_t argc, char *argv[
if ( ! optarg \|\| optarg[ 0 ] == '-' ) {	if ( ! optarg \|\| optarg[ 0 ] == '-' ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument missing\n"),	"-%c argument missing\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
Line 964 content_init( intgen_t argc, char *argv[	Line 964 content_init( intgen_t argc, char *argv[
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument %s is an "	"-%c argument %s is an "
"invalid pathname\n"),	"invalid pathname\n"),
optopt,	c,
optarg );	optarg );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
Line 981 content_init( intgen_t argc, char *argv[	Line 981 content_init( intgen_t argc, char *argv[
if ( rval ) {	if ( rval ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"cannot stat -%c argument %s (%s): %s\n"),	"cannot stat -%c argument %s (%s): %s\n"),
optopt,	c,
optarg,	optarg,
tranp->t_hkdir,	tranp->t_hkdir,
strerror( errno ));	strerror( errno ));
Line 992 content_init( intgen_t argc, char *argv[	Line 992 content_init( intgen_t argc, char *argv[
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument %s (%s) "	"-%c argument %s (%s) "
"is not a directory\n"),	"is not a directory\n"),
optopt,	c,
optarg,	optarg,
tranp->t_hkdir );	tranp->t_hkdir );
usage( );	usage( );
Line 1005 content_init( intgen_t argc, char *argv[	Line 1005 content_init( intgen_t argc, char *argv[
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"too many -%c arguments: "	"too many -%c arguments: "
"\"-%c %s\" already given\n"),	"\"-%c %s\" already given\n"),
optopt,	c,
optopt,	c,
tranp->t_reqdumplab );	tranp->t_reqdumplab );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
Line 1014 content_init( intgen_t argc, char *argv[	Line 1014 content_init( intgen_t argc, char *argv[
if ( ! optarg \|\| optarg[ 0 ] == '-' ) {	if ( ! optarg \|\| optarg[ 0 ] == '-' ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument missing\n"),	"-%c argument missing\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
Line 1023 content_init( intgen_t argc, char *argv[	Line 1023 content_init( intgen_t argc, char *argv[
sizeofmember( pers_t, s.dumplab )) {	sizeofmember( pers_t, s.dumplab )) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument %s too long: max is %d\n"),	"-%c argument %s too long: max is %d\n"),
optopt,	c,
optarg,	optarg,
sizeofmember( pers_t, s.dumplab ));	sizeofmember( pers_t, s.dumplab ));
usage( );	usage( );
Line 1036 content_init( intgen_t argc, char *argv[	Line 1036 content_init( intgen_t argc, char *argv[
if ( tranp->t_reqdumpidvalpr ) {	if ( tranp->t_reqdumpidvalpr ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"too many -%c arguments\n"),	"too many -%c arguments\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
if ( ! optarg \|\| optarg[ 0 ] == '-' ) {	if ( ! optarg \|\| optarg[ 0 ] == '-' ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument missing\n"),	"-%c argument missing\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
if (uuid_parse( optarg, tranp->t_reqdumpid ) < 0 ) {	if (uuid_parse( optarg, tranp->t_reqdumpid ) < 0 ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument not a valid uuid\n"),	"-%c argument not a valid uuid\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
Line 1065 content_init( intgen_t argc, char *argv[	Line 1065 content_init( intgen_t argc, char *argv[
optarg[ 0 ] == '-' ) {	optarg[ 0 ] == '-' ) {
mlog( MLOG_NORMAL, _(	mlog( MLOG_NORMAL, _(
"-%c argument missing\n"),	"-%c argument missing\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
if ( optarg[ 0 ] == '/' ) {	if ( optarg[ 0 ] == '/' ) {
mlog( MLOG_NORMAL, _(	mlog( MLOG_NORMAL, _(
"-%c argument must be relative\n"),	"-%c argument must be relative\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}
Line 1111 content_init( intgen_t argc, char *argv[	Line 1111 content_init( intgen_t argc, char *argv[
if ( ! optarg \|\| optarg[ 0 ] == '-' ) {	if ( ! optarg \|\| optarg[ 0 ] == '-' ) {
mlog( MLOG_NORMAL \| MLOG_ERROR, _(	mlog( MLOG_NORMAL \| MLOG_ERROR, _(
"-%c argument missing\n"),	"-%c argument missing\n"),
optopt );	c );
usage( );	usage( );
return BOOL_FALSE;	return BOOL_FALSE;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.45
changed lines
	Added in v.1.46