diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-10-25 19:01:37 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-10-25 19:01:37 +0000 |
| commit | e23e15aa5c1a1e476fb022edaefe95f5fbe9c97e (patch) | |
| tree | c790d6930c5a54c1ece2ec21afdcbe9dc6b5fdeb /src/sman | |
| parent | 465174ff1bb6292faefe0e047833fa2df5c1c92f (diff) | |
| download | open-axiom-e23e15aa5c1a1e476fb022edaefe95f5fbe9c97e.tar.gz | |
* lib/cfuns-c.c (oa_concatenate_string): Define.
* include/open-axiom.h (openaxiom_ifs): New.
(OPENAXIOM_TEXINPUTS_PATH): Likewise.
(OPENAXIOM_BIBINPUTS_PATH): Likewise.
* driver/main.c (augment_variable): New.
(upgrade_environment): Likewise. Call publish_systemdir.
(main): Call it instead of publish_systemdir. Handle 'spawn' driver.
* driver/utils.h (openaxiom_execute_driver): New kind of driver.
* driver/utils.c (openaxiom_preprocess_arguments): Tidy.
(openaxiom_execute_core): Likewise.
* sman/sman.c (process_arguments): Likewise.
(process_options): Likewise.
Diffstat (limited to 'src/sman')
| -rw-r--r-- | src/sman/sman.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sman/sman.c b/src/sman/sman.c index b4d73dd8..948a748a 100644 --- a/src/sman/sman.c +++ b/src/sman/sman.c @@ -209,8 +209,8 @@ process_arguments(openaxiom_command* command, int argc,char ** argv) argv[other++] = argv[arg]; } - command->core_argv = argv; - command->core_argc = other; + command->core.argv = argv; + command->core.argc = other; /* If there were no X libraries * at build-time, we proceed to @@ -251,10 +251,10 @@ process_options(openaxiom_command* command, int argc, char **argv) set_up_defaults(); process_arguments(command, argc, argv); /* Complain about command line arguments unknown to Superman. */ - if (command->core_argc > 0) { + if (command->core.argc > 0) { int i; - for (i = 0; i < command->core_argc; ++i) - fprintf(stderr,"command line error: %s\n", command->core_argv[i]); + for (i = 0; i < command->core.argc; ++i) + fprintf(stderr,"command line error: %s\n", command->core.argv[i]); exit(-1); } } @@ -527,10 +527,10 @@ fork_Axiom(openaxiom_command* cmd) } /* Tell the Core that it is being invoked in server mode. */ - openaxiom_allocate_command_argv(cmd, 2); - cmd->core_argv[0] = + oa_allocate_process_argv(&cmd->core, 2); + cmd->core.argv[0] = openaxiom_make_path_for(cmd->root_dir, openaxiom_core_driver); - cmd->core_argv[1] = "--role=server"; + cmd->core.argv[1] = "--role=server"; openaxiom_execute_core(cmd, openaxiom_core_driver); } } |