diff options
Diffstat (limited to 'src/preproc.c')
-rw-r--r-- | src/preproc.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/preproc.c b/src/preproc.c index 8debdcf..4ab3066 100644 --- a/src/preproc.c +++ b/src/preproc.c | |||
@@ -469,14 +469,14 @@ pop_source() | |||
469 | 469 | ||
470 | pp_line_stmt(); | 470 | pp_line_stmt(); |
471 | 471 | ||
472 | return 0; | 472 | return 0; |
473 | } | 473 | } |
474 | 474 | ||
475 | static int | 475 | char * |
476 | try_file(const char *name, int allow_cwd, int err_not_found, char **newp) | 476 | grecs_find_include_file(const char *name, int allow_cwd) |
477 | { | 477 | { |
478 | static char *cwd = "."; | 478 | static char *cwd = "."; |
479 | struct file_data fd; | 479 | struct file_data fd; |
480 | 480 | ||
481 | fd.name = name; | 481 | fd.name = name; |
482 | fd.namelen = strlen(name); | 482 | fd.namelen = strlen(name); |
@@ -492,22 +492,16 @@ try_file(const char *name, int allow_cwd, int err_not_found, char **newp) | |||
492 | grecs_list_remove_tail(include_path); | 492 | grecs_list_remove_tail(include_path); |
493 | } else | 493 | } else |
494 | pp_list_find(include_path, &fd); | 494 | pp_list_find(include_path, &fd); |
495 | 495 | ||
496 | if (!fd.found) { | 496 | if (!fd.found) { |
497 | pp_list_find(std_include_path, &fd); | 497 | pp_list_find(std_include_path, &fd); |
498 | 498 | if (!fd.found) | |
499 | if (!fd.found && err_not_found) { | 499 | return NULL; |
500 | grecs_error(&LOCUS, 0, | ||
501 | _("%s: No such file or directory"), name); | ||
502 | *newp = NULL; | ||
503 | } | ||
504 | } | 500 | } |
505 | if (fd.found) | 501 | return fd.buf; |
506 | *newp = fd.buf; | ||
507 | return fd.found; | ||
508 | } | 502 | } |
509 | 503 | ||
510 | static int | 504 | static int |
511 | parse_include(const char *text, int once) | 505 | parse_include(const char *text, int once) |
512 | { | 506 | { |
513 | struct wordsplit ws; | 507 | struct wordsplit ws; |
@@ -532,14 +526,19 @@ parse_include(const char *text, int once) | |||
532 | p[len - 1] = 0; | 526 | p[len - 1] = 0; |
533 | p++; | 527 | p++; |
534 | } | 528 | } |
535 | else | 529 | else |
536 | allow_cwd = 1; | 530 | allow_cwd = 1; |
537 | 531 | ||
538 | if (p[0] != '/' && try_file(p, allow_cwd, 1, &tmp)) | 532 | if (p[0] != '/') { |
539 | p = tmp; | 533 | p = grecs_find_include_file(p, allow_cwd); |
534 | if (!p) | ||
535 | grecs_error(&LOCUS, 0, | ||
536 | _("%s: No such file or directory"), | ||
537 | p); | ||
538 | } | ||
540 | } | 539 | } |
541 | 540 | ||
542 | if (p) | 541 | if (p) |
543 | rc = push_source(p, once); | 542 | rc = push_source(p, once); |
544 | grecs_free(tmp); | 543 | grecs_free(tmp); |
545 | wordsplit_free(&ws); | 544 | wordsplit_free(&ws); |
@@ -570,24 +569,25 @@ grecs_preproc_run(const char *config_file, const char *extpp) | |||
570 | if (grecs_preproc_init(config_file)) | 569 | if (grecs_preproc_init(config_file)) |
571 | return 1; | 570 | return 1; |
572 | if (extpp) { | 571 | if (extpp) { |
573 | FILE *outfile; | 572 | FILE *outfile; |
574 | char *setup_file; | 573 | char *setup_file; |
575 | char *cmd = NULL; | 574 | char *cmd = NULL; |
576 | 575 | ||
577 | if (try_file("pp-setup", 1, 0, &setup_file)) { | 576 | setup_file = grecs_find_include_file("pp-setup", 1); |
577 | if (setup_file) { | ||
578 | size_t size = 0; | 578 | size_t size = 0; |
579 | if (grecs_asprintf(&cmd, &size, | 579 | if (grecs_asprintf(&cmd, &size, |
580 | "%s %s -", extpp, setup_file)) | 580 | "%s %s -", extpp, setup_file)) |
581 | grecs_alloc_die(); | 581 | grecs_alloc_die(); |
582 | grecs_free(setup_file); | 582 | grecs_free(setup_file); |
583 | } else | 583 | } else |
584 | cmd = grecs_strdup (extpp); | 584 | cmd = grecs_strdup(extpp); |
585 | /*FIXME_DEBUG_F1 (2, "Running preprocessor: `%s'", cmd);*/ | 585 | /*FIXME_DEBUG_F1 (2, "Running preprocessor: `%s'", cmd);*/ |
586 | outfile = popen(cmd, "w"); | 586 | outfile = popen(cmd, "w"); |
587 | if (!outfile){ | 587 | if (!outfile) { |
588 | grecs_error(NULL, errno, | 588 | grecs_error(NULL, errno, |
589 | _("Unable to start external preprocessor `%s'"), | 589 | _("Unable to start external preprocessor `%s'"), |
590 | cmd); | 590 | cmd); |
591 | grecs_free(cmd); | 591 | grecs_free(cmd); |
592 | return 1; | 592 | return 1; |
593 | } | 593 | } |