to tabula-rasa

This commit is contained in:
rlar 2012-10-20 12:43:41 +02:00 committed by dwarning
parent 85a2a7d95a
commit 5e0fd1bf16
1 changed files with 33 additions and 28 deletions

View File

@ -36,6 +36,35 @@ static void byemesg(void);
static int confirm_quit(void);
void
tabula_rasa(void)
{
wordlist all = { "all", NULL, NULL };
wordlist star = { "*", NULL, NULL };
DevSwitch(NULL);
DevSwitch(NULL);
com_remcirc(NULL);
com_destroy(&all);
com_unalias(&star);
com_undefine(&star);
cp_remvar("history");
cp_remvar("noglob");
cp_remvar("brief");
cp_remvar("sourcepath");
cp_remvar("program");
cp_remvar("prompt");
cp_destroy_keywords();
destroy_ivars();
destroy_const_plot();
spice_destroy_devices();
}
void
com_quit(wordlist *wl)
{
@ -55,25 +84,6 @@ com_quit(wordlist *wl)
if (!noask && !confirm_quit())
return;
/* start to clean up the mess */
{
wordlist all = { "all", NULL, NULL };
wordlist star = { "*", NULL, NULL };
com_remcirc(NULL);
com_destroy(&all);
com_unalias(&star);
com_undefine(&star);
cp_remvar("history");
cp_remvar("noglob");
cp_remvar("brief");
cp_remvar("sourcepath");
cp_remvar("program");
cp_remvar("prompt");
}
#ifdef EXPERIMENTAL_CODE
/* Destroy CKT when quit. Add by Gong Ding, gdiso@ustc.edu */
if (!ft_nutmeg) {
@ -84,17 +94,12 @@ com_quit(wordlist *wl)
}
#endif
DevSwitch(NULL);
DevSwitch(NULL);
byemesg();
/* clean up the mess */
tabula_rasa();
/* then go away */
cp_destroy_keywords();
destroy_ivars();
byemesg();
destroy_const_plot();
spice_destroy_devices();
exit(exitcode);
}