Changeset 8de3388 in git

Timestamp:

Jul 15, 2010, 4:49:04 PM (13 years ago)

Author:

Andreas Steenpaß <steenpas@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

1dba075fdedd6b7fdac018f3b79cfab9ba2a2e52

Parents:

6263f270b03890e5e7d11a4d6e8a10544a454c92

Message:

M    kernel/misc.cc
M    Singular/misc_ip.cc
automatically closes all links on exit


git-svn-id: file:///usr/local/Singular/svn/trunk@13019 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/misc_ip.cc (modified) (1 diff)
• kernel/misc.cc (modified) (1 diff)

Singular/misc_ip.cc

@@ -1246 +1246 @@
 }
 
+/*2
+* the global exit routine of Singular
+*/
+#ifdef HAVE_MPSR
+void (*MP_Exit_Env_Ptr)()=NULL;
+#endif
+
+extern "C" {
+
+void m2_end(int i)
+{
+  fe_reset_input_mode();
+  #ifdef PAGE_TEST
+  mmEndStat();
+  #endif
+  #ifdef HAVE_TCL
+  if (tclmode)
+  {
+    PrintTCL('Q',0,NULL);
+  }
+  #endif
+  fe_reset_input_mode();
+  idhdl h = IDROOT;
+  while(h != NULL)
+  {
+    if(IDTYP(h) == LINK_CMD)
+    {
+      idhdl hh=h->next;
+      killhdl(h, currPack);
+      h = hh;
+    }
+    else
+    {
+      h = h->next;
+    }
+  }
+  if (i<=0)
+  {
+    #ifdef HAVE_TCL
+    if (!tclmode)
+    #endif
+      if (TEST_V_QUIET)
+      {
+        if (i==0)
+          printf("Auf Wiedersehen.\n");
+        else
+          printf("\n$Bye.\n");
+      }
+    //#ifdef sun
+    //  #ifndef __svr4__
+    //    _cleanup();
+    //    _exit(0);
+    //  #endif
+    //#endif
+    exit(0);
+  }
+  else
+  {
+    #ifdef HAVE_TCL
+    if (!tclmode)
+    #endif
+      printf("\nhalt %d\n",i);
+  }
+  #ifdef HAVE_MPSR
+  if (MP_Exit_Env_Ptr!=NULL) (*MP_Exit_Env_Ptr)();
+  #endif
+  exit(i);
+}
+}

kernel/misc.cc

@@ -49 +49 @@
 
 /*0 implementation*/
-
-/*2
-* the global exit routine of Singular
-*/
-#ifdef HAVE_MPSR
-void (*MP_Exit_Env_Ptr)()=NULL;
-#endif
-extern "C" {
-
-void m2_end(int i)
-{
-  fe_reset_input_mode();
-  #ifdef PAGE_TEST
-  mmEndStat();
-  #endif
-  #ifdef HAVE_TCL
-  if (tclmode)
-  {
-    PrintTCL('Q',0,NULL);
-  }
-  #endif
-  fe_reset_input_mode();
-  if (i<=0)
-  {
-    #ifdef HAVE_TCL
-    if (!tclmode)
-    #endif
-      if (TEST_V_QUIET)
-      {
-        if (i==0)
-          printf("Auf Wiedersehen.\n");
-        else
-          printf("\n$Bye.\n");
-      }
-    //#ifdef sun
-    //  #ifndef __svr4__
-    //    _cleanup();
-    //    _exit(0);
-    //  #endif
-    //#endif
-    exit(0);
-  }
-  else
-  {
-    #ifdef HAVE_TCL
-    if (!tclmode)
-    #endif
-      printf("\nhalt %d\n",i);
-  }
-  #ifdef HAVE_MPSR
-  if (MP_Exit_Env_Ptr!=NULL) (*MP_Exit_Env_Ptr)();
-  #endif
-  exit(i);
-}
-}
 
 /*2