Changeset 8af20e in git

Timestamp:

Jul 13, 2015, 4:41:41 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4454fb7575e18d653415f69c3fa97630b2a93f704721534daf9d6092daf10119f83b9b3d7da8a2c8

Parents:

e9478bb30a6f3a2d77328b3805644a035ac3e934

Message:

cntrlc handling: flush input

File:

• Singular/cntrlc.cc (modified) (3 diffs)

Singular/cntrlc.cc

@@ -5 +5 @@
 * ABSTRACT - interupt handling
 */
-#include <kernel/mod2.h>
-
-/* includes */
-#ifdef DecAlpha_OSF1
-#define _XOPEN_SOURCE_EXTENDED
-#endif /* MP3-Y2 0.022UF */
-
-#include <omalloc/omalloc.h>
-
-#include <reporter/si_signals.h>
-#include <Singular/fevoices.h>
-
-#include <Singular/tok.h>
-#include <Singular/ipshell.h>
-void sig_chld_hdl(int sig); /*#include <Singular/links/ssiLink.h>*/
-#include <Singular/cntrlc.h>
-#include <Singular/feOpt.h>
-#include <Singular/misc_ip.h>
-#include <Singular/links/silink.h>
-#include <Singular/links/ssiLink.h>
-
 #include <stdio.h>
 #include <stddef.h>
@@ -33 +12 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+
+#include <kernel/mod2.h>
+
+#include <omalloc/omalloc.h>
+
+#include <reporter/si_signals.h>
+#include <Singular/fevoices.h>
+
+#include <Singular/tok.h>
+#include <Singular/ipshell.h>
+#include <Singular/cntrlc.h>
+#include <Singular/feOpt.h>
+#include <Singular/misc_ip.h>
+#include <Singular/links/silink.h>
+#include <Singular/links/ssiLink.h>
 
 /* undef, if you don't want GDB to come up on error */
@@ -352 +346 @@
       if (feOptValue(FE_OPT_EMACS) == NULL)
       {
-        fputs("abort after this command(a), abort immediately(r), print backtrace(b), continue(c) or quit Singular(q) ?",stderr);fflush(stderr);
+        fputs("abort after this command(a), abort immediately(r), print backtrace(b), continue(c) or quit Singular(q) ?",stderr);
+        fflush(stderr);fflush(stdin);
         c = fgetc(stdin);
       }