OSSP CVS Repository

ossp - Check-in [3450]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 3450
Date: 2003-Jun-23 17:46:05 (local)
2003-Jun-23 15:46:05 (UTC)
User:ms
Branch:
Comment: Conform to original OpenPKG rc behaviour by processing in execute run mode by default, correct and explain return values, and adjust test suite.
Tickets:
Inspections:
Files:
ossp-pkg/rc/rc.pod      1.35 -> 1.36     4 inserted, 2 deleted
ossp-pkg/rc/rc_config.c      1.33 -> 1.34     1 inserted, 1 deleted
ossp-pkg/rc/rc_test.sh      1.26 -> 1.27     5 inserted, 0 deleted
ossp-pkg/rc/rc_test/rc.samba      1.6 -> 1.7     1 inserted, 1 deleted

ossp-pkg/rc/rc.pod 1.35 -> 1.36

--- 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
 


ossp-pkg/rc/rc_config.c 1.33 -> 1.34

--- 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))


ossp-pkg/rc/rc_test.sh 1.26 -> 1.27

--- 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 "<Press enter to continue>"
 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 "<Press enter to continue>"
+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


ossp-pkg/rc/rc_test/rc.samba 1.6 -> 1.7

--- 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

CVSTrac 2.0.1