--- rc_option.c 2002/02/13 19:19:28 1.3
+++ rc_option.c 2002/02/28 15:30:04 1.4
@@ -31,136 +31,16 @@
#include "rc.h"
#include "rc_private.h"
-#include "rc_option.h" /* Option operations rely on popt */
-#include "rc_const.h" /* Strings and other constants */
-/* Third party headers for libraries linked in */
-#include "popt.h" /* OSSP popt options library */
-/* Unique identifier to use with OSSP ex library */
-const char ossprc_id[] = "OSSP rc";
-
-
-/* Loops through available options and fills a configuration if encountered */
-rc_return_t procOpts(char cOpt, char *pcCLI)
+/* Loop through available options */
+rc_return_t optionProcess(void)
{
- int nPos = 0; /* For tracking options */
-
- switch (cOpt) {
- case 'h':
- pcCLI[nPos++] = 'h';
- break;
- case 'V':
- pcCLI[nPos++] = 'V';
- break;
- case 'i':
- pcCLI[nPos++] = 'i';
- break;
- case 'q':
- pcCLI[nPos++] = 'q';
- break;
- }
-
return(RC_THROW(RC_OK));
}
-rc_return_t parseOpts(int argc, char *argv[])
+/* Parse command line options */
+rc_return_t optionParse(void)
{
- ex_t Except;
- int bCaught = 0;
- char pcBuf[BUFSIZ+1];
- int nBufpos = 0; /* For tracking options */
- char cOpt = 0; /* For argument parsing */
- char *szCLIBuf = NULL;
- int nIter = 0;
- popt_context optCon; /* Context for parsing options */
-
- struct popt_option optionsTable[] = {
- /* Long options with short keys but no arguments */
- { RC_USE_NAME, '?', POPT_ARG_NONE, 0, RC_USE_VAL, RC_USE_DESC, NULL },
- { RC_DBG_NAME, 'd', POPT_ARG_NONE, 0, RC_DBG_VAL, RC_DBG_DESC, NULL },
- { RC_VER_NAME, 'V', POPT_ARG_NONE, 0, RC_VER_VAL, RC_VER_DESC, NULL },
- { RC_EVL_NAME, 'e', POPT_ARG_NONE, 0, RC_EVL_VAL, RC_EVL_DESC, NULL },
- { RC_HLP_NAME, 'h', POPT_ARG_NONE, 0, RC_HLP_VAL, RC_HLP_DESC, NULL },
- { RC_INF_NAME, 'i', POPT_ARG_NONE, 0, RC_INF_VAL, RC_INF_DESC, NULL },
- { RC_LBL_NAME, 'l', POPT_ARG_NONE, 0, RC_LBL_VAL, RC_LBL_DESC, NULL },
- { RC_PRN_NAME, 'p', POPT_ARG_NONE, 0, RC_PRN_VAL, RC_PRN_DESC, NULL },
- { RC_SIL_NAME, 's', POPT_ARG_NONE, 0, RC_SIL_VAL, RC_SIL_DESC, NULL },
- { RC_RAW_NAME, 'r', POPT_ARG_NONE, 0, RC_RAW_VAL, RC_RAW_DESC, NULL },
- { RC_VRB_NAME, 'v', POPT_ARG_NONE, 0, RC_VRB_VAL, RC_VRB_DESC, NULL },
- { RC_EXC_NAME, 'x', POPT_ARG_NONE, 0, RC_EXC_VAL, RC_EXC_DESC, NULL },
-
- /* Single argument long options with short keys */
- {RC_LOC_NAME, 'L', POPT_ARG_STRING, 0, RC_LOC_VAL, RC_LOC_DESC, "regx"},
- {RC_CNF_NAME, 'c', POPT_ARG_STRING, 0, RC_CNF_VAL, RC_CNF_DESC, "path"},
- {RC_FNC_NAME, 'f', POPT_ARG_STRING, 0, RC_FNC_VAL, RC_FNC_DESC, "path"},
- {RC_QRY_NAME, 'q', POPT_ARG_STRING, 0, RC_QRY_VAL, RC_QRY_DESC, "varx"},
- {RC_TMP_NAME, 't', POPT_ARG_STRING, 0, RC_TMP_VAL, RC_TMP_DESC, "path"},
-
- /* Single argument long options without short keys */
- { RC_OWN_NAME, 0, POPT_ARG_STRING, 0, RC_OWN_VAL, RC_OWN_DESC, "user" },
- { RC_GRP_NAME, 0, POPT_ARG_STRING, 0, RC_GRP_VAL, RC_GRP_DESC, "group"},
- { RC_MSK_NAME, 0, POPT_ARG_INT, 0, RC_MSK_VAL, RC_MSK_DESC, "umask"},
- { RC_ASS_NAME, 0, POPT_ARG_STRING, 0, RC_ASS_VAL, RC_ASS_DESC, "regx" },
- { RC_DEF_NAME, 0, POPT_ARG_STRING, 0, RC_DEF_VAL, RC_DEF_DESC, "regx" },
- { RC_REF_NAME, 0, POPT_ARG_STRING, 0, RC_REF_VAL, RC_REF_DESC, "regx" },
- { RC_PRM_NAME, 0, POPT_ARG_STRING, 0, RC_PRM_VAL, RC_PRM_DESC, "regx" },
- { RC_TRM_NAME, 0, POPT_ARG_STRING, 0, RC_TRM_VAL, RC_TRM_DESC, "regx" },
- { RC_NCF_NAME, 0, POPT_ARG_STRING, 0, RC_NCF_VAL, RC_NCF_DESC, "name" },
- { RC_CMN_NAME, 0, POPT_ARG_STRING, 0, RC_CMN_VAL, RC_CMN_DESC, "name" },
- { RC_DFL_NAME, 0, POPT_ARG_STRING, 0, RC_DFL_VAL, RC_DFL_DESC, "name" },
- { RC_ERR_NAME, 0, POPT_ARG_STRING, 0, RC_ERR_VAL, RC_ERR_DESC, "name" },
-
- POPT_AUTOHELP
- { NULL, 0, 0, NULL, 0 }
- };
-
- optCon = popt_getcontext(NULL, argc, (const char **)argv, optionsTable, 0);
- popt_setotheroptionhelp(optCon, "[options] <rcfile> <sections [args]>");
-
- if (argc < 2) {
- popt_printusage(optCon, stderr, 0);
- return(RC_THROW(RC_ERR_USE));
- }
-
- /* Now do options processing */
- while ((cOpt = popt_getnextopt(optCon)) >= 0)
- ex_try {
- procOpts(cOpt, pcBuf);
- }
- ex_catch(Except) {
- if ((rc_return_t)Except.ex_value != RC_ERR_USE)
- fprintf(stderr, "Nonusage exception: %d\n",\
- (rc_return_t)Except.ex_value);
- bCaught = 1;
- fprintf(stderr, "Class '%s' threw exception %d in %s:%s():%d.\n",\
- (char *)Except.ex_class, *(int *)Except.ex_value,\
- Except.ex_file, Except.ex_func, Except.ex_line);
- }
- if (!bCaught)
- fprintf(stderr, "parseOpts: No exceptions caught.\n");
-
- szCLIBuf = (char *)popt_getarg(optCon);
- if ((szCLIBuf == NULL)) {
- fprintf(stderr, "Please specify at least one rcfile and section.\n");
- popt_printusage(optCon, stderr, 0);
- return(RC_THROW(RC_ERR_USE));
- }
-
- if (cOpt < -1) {
- /* An error occurred during option processing */
- fprintf(stderr, "%s: %s\n",
- popt_badoption(optCon, POPT_BADOPTION_NOALIAS),
- popt_strerror(cOpt));
- return(RC_THROW(RC_ERR_INT));
- }
-
- /* Print out options, szCLIBuf chosen */
- fprintf(stderr, "Options chosen: ");
- for (nIter = 0; nIter < nBufpos ; nIter++)
- fprintf(stderr, "-%c ", pcBuf[nIter]);
- fprintf(stderr, "\nRun these commands: %s\n", szCLIBuf);
-
- popt_freecontext(optCon);
return(RC_THROW(RC_OK));
}
|
