mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 04:40:29 +02:00
Code Activity

(invoke_main_func): Don't call exit here. Throws that

Browse source 
are only caught by scm_with_guile will bypass us and would cause
scm_boot_guile to return erroneously.
(scm_boot_guile): Expect scm_with_guile to return and call exit
here, passing it an appropriate exit code.
This commit is contained in:
Marius Vollmer 2005-12-07 01:32:17 +00:00
parent e724644d45
commit 657e792903
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libguile/init.c
View file

@ -339,6 +339,7 @@ static void *invoke_main_func(void *body_data);
void void
scm_boot_guile (int argc, char ** argv, void (*main_func) (), void *closure) scm_boot_guile (int argc, char ** argv, void (*main_func) (), void *closure)
{ {
void *res;
struct main_func_closure c; struct main_func_closure c;
c.main_func = main_func; c.main_func = main_func;
@ -346,7 +347,15 @@ scm_boot_guile (int argc, char ** argv, void (*main_func) (), void *closure)
c.argc = argc; c.argc = argc;
c.argv = argv; c.argv = argv;
scm_with_guile (invoke_main_func, &c); res = scm_with_guile (invoke_main_func, &c);
/* If the caller doesn't want this, they should exit from main_func
themselves.
*/
if (res == NULL)
exit (EXIT_FAILURE);
else
exit (0);
} }
static void * static void *
@ -365,13 +374,9 @@ invoke_main_func (void *body_data)
*/ */
SCM_ASYNC_TICK; SCM_ASYNC_TICK;
/* If the caller doesn't want this, they should exit from main_func /* Indicate success by returning non-NULL.
themselves. */
*/ return (void *)1;
exit (0);
/* never reached */
return NULL;
} }
scm_i_pthread_mutex_t scm_i_init_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER; scm_i_pthread_mutex_t scm_i_init_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;