OSSP CVS Repository

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

Check-in Number: 2464
Date: 2002-Aug-01 13:59:55 (local)
2002-Aug-01 11:59:55 (UTC)
User:ms
Branch:
Comment: Moved call to configVerify to squash yet another early error bug.
Tickets:
Inspections:
Files:
ossp-pkg/rc/00TODO      1.33 -> 1.34     3 inserted, 0 deleted
ossp-pkg/rc/rc.c      1.40 -> 1.41     0 inserted, 1 deleted
ossp-pkg/rc/rc_config.c      1.25 -> 1.26     1 inserted, 2 deleted

ossp-pkg/rc/00TODO 1.33 -> 1.34

--- 00TODO       2002/08/01 09:45:19     1.33
+++ 00TODO       2002/08/01 11:59:55     1.34
@@ -23,6 +23,9 @@
 Document
   Refs, pri, user, group, ci, go only in normal (not special) sections.
 
+Questions
+  Should location regex specify a directory and prefix separately, or files*?
+
 Consider
   Nice to have feature for ex, a pEx->pObj->strErr(pEx->Value);
   Removing the OSSP_RC_DEACT deactivation feature (thl.)


ossp-pkg/rc/rc.c 1.40 -> 1.41

--- rc.c 2002/07/29 16:34:58     1.40
+++ rc.c 2002/08/01 11:59:55     1.41
@@ -42,7 +42,6 @@
     try {                       /* Configuration block, config is built here  */
         configNew();            /* Construct a new config, add default values */
         configLoad(argc, (const char **)argv);   /* Load cli, env, and conf   */
-        configVerify();         /* Test for usage, help and version options   */
         configDefaults();       /* Add default values to empty config members */
     }
     catch(Except)               /* Exceptions of the configuration block      */


ossp-pkg/rc/rc_config.c 1.25 -> 1.26

--- rc_config.c  2002/08/01 08:09:04     1.25
+++ rc_config.c  2002/08/01 11:59:55     1.26
@@ -204,6 +204,7 @@
 
     try {       /* Parse option groups in order of priority          */
         clioptParseopts(nTotal, szArgvec);  /* Command line options  */
+        configVerify();  /* Test for usage, help and version options */
         clioptParseargs();                  /* Command line args */
 /*        envoptParse(m_nLocks->pOpt);*/    /* Environment options   */
 /*        cnfoptParse(m_nLocks->pOpt);*/    /* Configfile options    */
@@ -226,8 +227,6 @@
     ex_t Except;
     short bStop = FALSE;
 
-
-
     try { /* Checks for legal option combination */
         /* I'm too braindead to remember digital logic theory from the */
         /* Uni, so I'll hack my own XOR gates with plain math instead  */

CVSTrac 2.0.1