*** ../../Original/octave-2.1.43/src/octave.cc Thu Jan 2 17:55:59 2003 --- octave.cc Thu Jan 9 15:09:11 2003 *************** maximum_braindamage (void) *** 362,368 **** // You guessed it. int ! octave_main (int argc, char **argv) { octave_env::set_program_name (argv[0]); --- 362,368 ---- // You guessed it. int ! octave_main (int argc, char **argv, int embedded) { octave_env::set_program_name (argv[0]); *************** octave_main (int argc, char **argv) *** 391,397 **** initialize_pathsearch (); ! install_signal_handlers (); initialize_file_io (); --- 391,398 ---- initialize_pathsearch (); ! if(!embedded) ! install_signal_handlers (); initialize_file_io (); *************** octave_main (int argc, char **argv) *** 573,583 **** // Is input coming from a terminal? If so, we are probably // interactive. ! interactive = (isatty (fileno (stdin)) && isatty (fileno (stdout))); intern_argv (argc, argv); ! switch_to_buffer (create_buffer (get_input_from_stdin ())); } // Force input to be echoed if not really interactive, but the user --- 574,585 ---- // Is input coming from a terminal? If so, we are probably // interactive. ! interactive = (isatty (fileno (stdin)) && isatty (fileno (stdout))) && !embedded; intern_argv (argc, argv); ! if(!embedded) ! switch_to_buffer (create_buffer (get_input_from_stdin ())); } // Force input to be echoed if not really interactive, but the user *************** octave_main (int argc, char **argv) *** 595,600 **** --- 597,605 ---- if (! interactive) line_editing = false; + if(embedded) + return(1); + int retval = main_loop (); if (retval == 1 && ! error_state) *** ../../Original/octave-2.1.43/src/main.c Wed Nov 20 14:03:08 2002 --- main.c Thu Jan 9 15:03:45 2003 *************** Software Foundation, 59 Temple Place - S *** 32,38 **** int main (int argc, char **argv) { ! return octave_main (argc, argv); } /* --- 32,38 ---- int main (int argc, char **argv) { ! return octave_main (argc, argv, 0); } /* *** ../../Original/octave-2.1.43/src/octave.h Thu Oct 17 15:58:43 2002 --- octave.h Thu Jan 9 15:03:38 2003 *************** Software Foundation, 59 Temple Place - S *** 27,33 **** extern "C" { #endif ! extern int octave_main (int argc, char **argv); #ifdef __cplusplus } --- 27,33 ---- extern "C" { #endif ! extern int octave_main (int argc, char **argv, int embedded); #ifdef __cplusplus }