Index: ossp-pkg/rc/rc.pod RCS File: /v/ossp/cvs/ossp-pkg/rc/rc.pod,v rcsdiff -q -kk '-r1.35' '-r1.36' -u '/v/ossp/cvs/ossp-pkg/rc/rc.pod,v' 2>/dev/null --- rc.pod 2003/06/23 14:53:10 1.35 +++ rc.pod 2003/06/23 15:46:05 1.36 @@ -256,9 +256,11 @@ =head1 RETURN VALUE --1 Error in rc 0 Success - 1 Error in command executed by rc + 1 Failure + + A non-zero return value signals failure, and may indicate such error states + as an illegal combination of options or nonexisting locations directory. =head1 ERROR HANDLING Index: ossp-pkg/rc/rc_config.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_config.c,v rcsdiff -q -kk '-r1.33' '-r1.34' -u '/v/ossp/cvs/ossp-pkg/rc/rc_config.c,v' 2>/dev/null --- rc_config.c 2003/06/18 14:35:29 1.33 +++ rc_config.c 2003/06/23 15:46:05 1.34 @@ -289,7 +289,7 @@ try { /* Test members for empty attributes */ if (!configGetval(RC_EVL_VAL) && !configGetval(RC_EXC_VAL) \ && !configGetval(RC_PRN_VAL) && !configGetval(RC_PAR_VAL)) - clioptSetval(RC_PRN_VAL, RC_DEF_ON); + clioptSetval(RC_EXC_VAL, RC_DEF_ON); /* if (!configGetval(RC_USE_VAL)) if (!configGetval(RC_HLP_VAL)) Index: ossp-pkg/rc/rc_test.sh RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_test.sh,v rcsdiff -q -kk '-r1.26' '-r1.27' -u '/v/ossp/cvs/ossp-pkg/rc/rc_test.sh,v' 2>/dev/null --- rc_test.sh 2003/06/13 10:53:53 1.26 +++ rc_test.sh 2003/06/23 15:46:05 1.27 @@ -48,6 +48,11 @@ ./rc -Dpf ./rc_test/rcfuncs -irt /tmp -L rc_test -c rc.conf samba search finish echo; echo "" read dummy;clear +echo "*** Test and evaluate short options, should succeed ***" +echo "eval \`./rc -Def ./rc_test/rcfuncs -irt /tmp -L rc_test -c rc.conf samba search finish\`" +eval `./rc -Def ./rc_test/rcfuncs -irt /tmp -L rc_test -c rc.conf samba search finish` +echo; echo "" +read dummy;clear echo "*** Test short options with verbose, should succeed ***" echo "./rc -Dpf ./rc_test/rcfuncs -irvt /tmp -L rc_test -c rc.conf samba search finish" ./rc -Dpf ./rc_test/rcfuncs -irvt /tmp -L rc_test -c rc.conf samba search finish Index: ossp-pkg/rc/rc_test/rc.samba RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_test/rc.samba,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/rc/rc_test/rc.samba,v' 2>/dev/null --- rc.samba 2003/06/03 15:28:09 1.6 +++ rc.samba 2003/06/23 15:46:06 1.7 @@ -11,7 +11,7 @@ %search -u root id -un - whois cyvaned.com + whois cw.com %destroy -u sw-n id -un