Overview
Comment: | Added an environment parser. Cleaned up some memory leaks. Made lc_process() cleanup, so calling lc_process() twice will do nothing. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d7ae2bcb59d634be41a90d9b223098af |
User & Date: | rkeene on 2004-10-28 22:39:10 |
Other Links: | manifest | tags |
Context
2004-10-28
| ||
23:18 | Additional man pages created, and cleaned up check-in: 660883b103 user: rkeene tags: trunk | |
22:39 | Added an environment parser. Cleaned up some memory leaks. Made lc_process() cleanup, so calling lc_process() twice will do nothing. check-in: d7ae2bcb59 user: rkeene tags: trunk | |
21:32 | Added a variable type "BOOL_BY_EXISTANCE" that enables things just by being specified. check-in: 307def9899 user: rkeene tags: trunk | |
Changes
Modified libconfig.c from [29ab6be894] to [263f038910].
︙ | ︙ | |||
35 36 37 38 39 40 41 42 43 44 45 46 47 48 | #ifdef HAVE_PWD_H #include <pwd.h> #endif struct lc_varhandler_st *varhandlers = NULL; lc_err_t lc_errno = LC_ERR_NONE; int lc_optind = 0; static int lc_process_var_string(void *data, const char *value) { char **dataval; dataval = data; *dataval = strdup(value); | > > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | #ifdef HAVE_PWD_H #include <pwd.h> #endif struct lc_varhandler_st *varhandlers = NULL; lc_err_t lc_errno = LC_ERR_NONE; int lc_optind = 0; extern char **environ; static int lc_process_var_string(void *data, const char *value) { char **dataval; dataval = data; *dataval = strdup(value); |
︙ | ︙ | |||
273 274 275 276 277 278 279 | break; } return(-1); } static int lc_process_environment(const char *appname) { | > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 | break; } return(-1); } static int lc_process_environment(const char *appname) { struct lc_varhandler_st *handler = NULL; size_t appnamelen = 0; char varnamebuf[128] = {0}; char **currvar; char *sep = NULL, *value = NULL, *cmd = NULL; char *ucase_appname = NULL, *ucase_appname_itr = NULL; char *lastcomponent_handler = NULL; int varnamelen = 0; /* Make sure we have an environment to screw with, if not, no arguments were found to be in error */ if (environ == NULL || appname == NULL) { return(0); } /* Allocate and create our uppercase appname. */ ucase_appname = strdup(appname); if (ucase_appname == NULL) { lc_errno = LC_ERR_ENOMEM; return(-1); } for (ucase_appname_itr = ucase_appname; *ucase_appname_itr != '\0'; *ucase_appname_itr++) { *ucase_appname_itr = toupper(*ucase_appname_itr); } appnamelen = strlen(ucase_appname); for (currvar = environ; *currvar != NULL; *currvar++) { /* If it doesn't begin with our appname ignore it completely. */ if (strncmp(*currvar, ucase_appname, appnamelen) != 0) { continue; } /* Find our seperator. */ sep = strchr(*currvar, '='); if (sep == NULL) { continue; } varnamelen = sep - *currvar; /* Skip variables that would overflow our buffer. */ if (varnamelen >= sizeof(varnamebuf)) { continue; } strncpy(varnamebuf, *currvar, varnamelen); varnamebuf[varnamelen] = '\0'; value = sep + 1; /* We ignore APPNAME by itself. */ if (strlen(varnamebuf) <= appnamelen) { continue; } /* Further it must be <APPNAME>_ */ if (varnamebuf[appnamelen] != '_') { continue; } cmd = varnamebuf + appnamelen + 1; /* We don't allow section specifiers, for reasons see notes in the cmdline processor (below). */ if (strchr(cmd, '.') != NULL) { continue; } for (handler = varhandlers; handler != NULL; handler = handler->_next) { if (handler->var == NULL) { continue; } /* Skip handlers which don't agree with being processed outside a config file */ if (handler->type == LC_VAR_SECTION || handler->type == LC_VAR_SECTIONSTART || handler->type == LC_VAR_SECTIONEND || handler->type == LC_VAR_UNKNOWN) { continue; } /* Find the last part of the variable and compare it with the option being processed, if a wildcard is given. */ if (handler->var[0] == '*' && handler->var[1] == '.') { lastcomponent_handler = strrchr(handler->var, '.'); if (lastcomponent_handler == NULL) { lastcomponent_handler = handler->var; } else { *lastcomponent_handler++; } } else { lastcomponent_handler = handler->var; } /* Ignore this handler if they don't match. */ if (strcasecmp(lastcomponent_handler, cmd) != 0) { continue; } if (handler->type == LC_VAR_NONE || handler->type == LC_VAR_BOOL_BY_EXISTANCE) { value = NULL; } /* We ignore errors from the environment variables, they're mostly insignificant. */ lc_handle(handler, cmd, NULL, value, LC_FLAGS_ENVIRON); break; } } free(ucase_appname); return(0); } static int lc_process_cmdline(int argc, char **argv) { struct lc_varhandler_st *handler = NULL; char *cmdarg = NULL, *cmdoptarg = NULL; char *lastcomponent_handler = NULL; |
︙ | ︙ | |||
301 302 303 304 305 306 307 308 309 310 311 312 313 314 | newargv[newargvidx++] = argv[0]; newargv[argc] = NULL; /* Allocate space to indicate which arguments have been used. */ usedargv = malloc(argc * sizeof(*usedargv)); if (usedargv == NULL) { lc_errno = LC_ERR_ENOMEM; return(-1); } for (cmdargidx = 0; cmdargidx < argc; cmdargidx++) { usedargv[cmdargidx] = 0; } for (cmdargidx = 1; cmdargidx < argc; cmdargidx++) { | > | 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 | newargv[newargvidx++] = argv[0]; newargv[argc] = NULL; /* Allocate space to indicate which arguments have been used. */ usedargv = malloc(argc * sizeof(*usedargv)); if (usedargv == NULL) { lc_errno = LC_ERR_ENOMEM; free(newargv); return(-1); } for (cmdargidx = 0; cmdargidx < argc; cmdargidx++) { usedargv[cmdargidx] = 0; } for (cmdargidx = 1; cmdargidx < argc; cmdargidx++) { |
︙ | ︙ | |||
382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 | if (handler->type == LC_VAR_NONE || handler->type == LC_VAR_BOOL_BY_EXISTANCE) { cmdoptarg = NULL; } else { cmdargidx++; if (cmdargidx >= argc) { PRINTERR("Argument required."); lc_errno = LC_ERR_BADFORMAT; return(-1); } cmdoptarg = argv[cmdargidx]; newargv[newargvidx++] = cmdoptarg; usedargv[cmdargidx] = 1; } chkretval = lc_handle(handler, handler->var, NULL, cmdoptarg, LC_FLAGS_CMDLINE); if (chkretval < 0) { retval = -1; } break; } if (handler == NULL) { PRINTERR("Unknown option: --%s", cmdarg); lc_errno = LC_ERR_INVCMD; return(-1); } } else { for (; *cmdarg != '\0'; *cmdarg++) { ch = *cmdarg; for (handler = varhandlers; handler != NULL; handler = handler->_next) { | > > > > | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | if (handler->type == LC_VAR_NONE || handler->type == LC_VAR_BOOL_BY_EXISTANCE) { cmdoptarg = NULL; } else { cmdargidx++; if (cmdargidx >= argc) { PRINTERR("Argument required."); lc_errno = LC_ERR_BADFORMAT; free(usedargv); free(newargv); return(-1); } cmdoptarg = argv[cmdargidx]; newargv[newargvidx++] = cmdoptarg; usedargv[cmdargidx] = 1; } chkretval = lc_handle(handler, handler->var, NULL, cmdoptarg, LC_FLAGS_CMDLINE); if (chkretval < 0) { retval = -1; } break; } if (handler == NULL) { PRINTERR("Unknown option: --%s", cmdarg); lc_errno = LC_ERR_INVCMD; free(usedargv); free(newargv); return(-1); } } else { for (; *cmdarg != '\0'; *cmdarg++) { ch = *cmdarg; for (handler = varhandlers; handler != NULL; handler = handler->_next) { |
︙ | ︙ | |||
426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 | if (handler->type == LC_VAR_NONE || handler->type == LC_VAR_BOOL_BY_EXISTANCE) { cmdoptarg = NULL; } else { cmdargidx++; if (cmdargidx >= argc) { PRINTERR("Argument required."); lc_errno = LC_ERR_BADFORMAT; return(-1); } cmdoptarg = argv[cmdargidx]; newargv[newargvidx++] = cmdoptarg; usedargv[cmdargidx] = 1; } chkretval = lc_handle(handler, handler->var, NULL, cmdoptarg, LC_FLAGS_CMDLINE); if (chkretval < 0) { retval = -1; } break; } if (handler == NULL) { PRINTERR("Unknown option: -%c", ch); lc_errno = LC_ERR_INVCMD; return(-1); } } } } if (retval >= 0) { | > > > > | 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 | if (handler->type == LC_VAR_NONE || handler->type == LC_VAR_BOOL_BY_EXISTANCE) { cmdoptarg = NULL; } else { cmdargidx++; if (cmdargidx >= argc) { PRINTERR("Argument required."); lc_errno = LC_ERR_BADFORMAT; free(usedargv); free(newargv); return(-1); } cmdoptarg = argv[cmdargidx]; newargv[newargvidx++] = cmdoptarg; usedargv[cmdargidx] = 1; } chkretval = lc_handle(handler, handler->var, NULL, cmdoptarg, LC_FLAGS_CMDLINE); if (chkretval < 0) { retval = -1; } break; } if (handler == NULL) { PRINTERR("Unknown option: -%c", ch); lc_errno = LC_ERR_INVCMD; free(usedargv); free(newargv); return(-1); } } } } if (retval >= 0) { |
︙ | ︙ | |||
465 466 467 468 469 470 471 472 473 474 475 476 477 478 | newargv[newargvidx++] = cmdarg; } for (cmdargidx = 1; cmdargidx < argc; cmdargidx++) { argv[cmdargidx] = newargv[cmdargidx]; } } return(retval); } int lc_process_var(const char *var, const char *varargs, const char *value, lc_flags_t flags) { struct lc_varhandler_st *handler = NULL; | > > > | 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 | newargv[newargvidx++] = cmdarg; } for (cmdargidx = 1; cmdargidx < argc; cmdargidx++) { argv[cmdargidx] = newargv[cmdargidx]; } } free(usedargv); free(newargv); return(retval); } int lc_process_var(const char *var, const char *varargs, const char *value, lc_flags_t flags) { struct lc_varhandler_st *handler = NULL; |
︙ | ︙ | |||
662 663 664 665 666 667 668 669 670 671 672 673 674 675 | break; } } } return(retval); } int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra) { int retval = 0, chkretval = 0; /* Handle config files. */ chkretval = lc_process_files(appname, type, extra); if (chkretval < 0) { | > > > > > > > > > > > > > > > > > > > | 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 | break; } } } return(retval); } static void lc_cleanup(void) { struct lc_varhandler_st *handler = NULL, *next = NULL; handler = varhandlers; while (handler != NULL) { if (handler->var != NULL) { free(handler->var); } next = handler->_next; free(handler); handler = next; } return; } int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra) { int retval = 0, chkretval = 0; /* Handle config files. */ chkretval = lc_process_files(appname, type, extra); if (chkretval < 0) { |
︙ | ︙ | |||
683 684 685 686 687 688 689 690 691 692 693 694 695 696 | } /* Handle command line arguments */ chkretval = lc_process_cmdline(argc, argv); if (chkretval < 0) { retval = -1; } return(retval); } lc_err_t lc_geterrno(void) { lc_err_t retval; | > > > | 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 | } /* Handle command line arguments */ chkretval = lc_process_cmdline(argc, argv); if (chkretval < 0) { retval = -1; } /* Free our structures. */ lc_cleanup(); return(retval); } lc_err_t lc_geterrno(void) { lc_err_t retval; |
︙ | ︙ |