Index: ossp-pkg/rc/00TODO RCS File: /v/ossp/cvs/ossp-pkg/rc/00TODO,v rcsdiff -q -kk '-r1.23' '-r1.24' -u '/v/ossp/cvs/ossp-pkg/rc/00TODO,v' 2>/dev/null --- 00TODO 2002/04/24 16:47:07 1.23 +++ 00TODO 2002/05/13 16:57:00 1.24 @@ -12,6 +12,7 @@ Known bugs Not multithreaded (too many potentials for race conditions or overwrite) + Not efficient (reads whole files when only parts are needed...) Document Refs, pri, user, group, ci, go only in normal (not special) sections. Index: ossp-pkg/rc/rc.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc.c,v rcsdiff -q -kk '-r1.24' '-r1.25' -u '/v/ossp/cvs/ossp-pkg/rc/rc.c,v' 2>/dev/null --- rc.c 2002/04/25 16:17:57 1.24 +++ rc.c 2002/05/13 16:57:00 1.25 @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) { ex_t Except; - rc_t *pRc = NULL; + rc_proc_t *pProc = NULL; ex_try { configNew(); /* Construct a new configuration */ @@ -49,15 +49,15 @@ configDebug(); /* FIXME Remove FIXME */ configVerify(); /* Test for usage, help, and version options */ - pRc = procNew(); - procReadtmp(pRc, configGetval(RC_TMP_VAL)); -/* procReadfuncs(pRc, configGetval(RC_FNC_VAL)); - procReadrc(pRc, configGetrcfile()); - for (i = 0; i < clioptGetseclen; procSection(pRc, configGetsec(i++))); - procParse(pRc); /- Script generation -/ - procRun(pRc);*/ /* [Execute|Evaluate|Print] script */ + pProc = procNew(); + procReadtmp(pProc, configGetval(RC_TMP_VAL)); +/* procReadfuncs(pProc, configGetval(RC_FNC_VAL)); + procReadrc(pProc, configGetrcfile()); + for (i = 0; i < clioptGetseclen; procSection(pProc, configGetsec(i++))); + procParse(pProc); /- Script generation -/ + procRun(pProc);*/ /* [Execute|Evaluate|Print] script */ - procDelete(pRc); + procDelete(pProc); configDelete(); } ex_catch(Except) { Index: ossp-pkg/rc/rc.h RCS File: /v/ossp/cvs/ossp-pkg/rc/rc.h,v rcsdiff -q -kk '-r1.24' '-r1.25' -u '/v/ossp/cvs/ossp-pkg/rc/rc.h,v' 2>/dev/null --- rc.h 2002/04/25 16:17:57 1.24 +++ rc.h 2002/05/13 16:57:00 1.25 @@ -55,10 +55,10 @@ RC_ERR_INT /* Internal error */ } rc_return_t; -/* Rc class */ +/* Processor class */ typedef struct { int nTmpfile; /* Temp file descriptor */ -} rc_t; +} rc_proc_t; /* Rc script type */ typedef char *rc_script_t; @@ -104,14 +104,14 @@ rc_return_t clioptSetsec(const char **); /* Processor function prototypes */ -rc_t *procNew(void); -rc_return_t procDelete(rc_t *); -rc_return_t procReadfuncs(rc_t *, char *); -rc_return_t procReadtmp(rc_t *, char *); -rc_return_t procReadrc(rc_t *, char *); -rc_return_t procSection(rc_t *, char *); -rc_return_t procParse(rc_t *); -rc_return_t procRun(rc_t *); +rc_proc_t *procNew(void); +rc_return_t procDelete(rc_proc_t *); +rc_return_t procReadfuncs(rc_proc_t *, const char *); +rc_return_t procReadtmp(rc_proc_t *, const char *); +rc_return_t procReadrc(rc_proc_t *, const char *); +rc_return_t procSection(rc_proc_t *, const char *); +rc_return_t procParse(rc_proc_t *); +rc_return_t procRun(rc_proc_t *); /* Option function prototypes */ /*FIXME rc_return_t optNew(rc_opt_t **); Index: ossp-pkg/rc/rc_proc.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_proc.c,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/rc/rc_proc.c,v' 2>/dev/null --- rc_proc.c 2002/04/25 16:17:57 1.1 +++ rc_proc.c 2002/05/13 16:57:00 1.2 @@ -36,19 +36,19 @@ * procNew(void) * * Construct a processor * ************************************************/ -rc_t *procNew(void) +rc_proc_t *procNew(void) { - rc_t *pNewrc = NULL; + rc_proc_t *pNewrc = NULL; - pNewrc = malloc(sizeof(rc_t)); + pNewrc = malloc(sizeof(rc_proc_t)); return(pNewrc); } /************************************************ -* procReadtmp(rc_t *, char *) * +* procReadtmp(rc_proc_t *, const char *) * * Open and store a temp file * ************************************************/ -rc_return_t procReadtmp(rc_t *pRc, char *szTmpname) +rc_return_t procReadtmp(rc_proc_t *pRc, const char *szTmpname) { fprintf(stderr, "%s!!!\n", szTmpname); @@ -56,10 +56,10 @@ } /************************************************ -* procDelete(rc_t *) * +* procDelete(rc_proc_t *) * * Destruct a processor * ************************************************/ -rc_return_t procDelete(rc_t *pRc) +rc_return_t procDelete(rc_proc_t *pRc) { free(pRc);