Changeset 8f769bb in git

Timestamp:

Sep 22, 1999, 12:19:05 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

fcc8828a7bb095ce2cfa6cabeb554095b3e4aefe

Parents:

2907f59317cf17c238dd583d6ac1c10ba279ba40

Message:

* hannes: dynamic readline


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

Location:

Singular

Files:

• febase.h (modified) (2 diffs)
• fegetopt.c (modified) (2 diffs)
• feread.cc (modified) (8 diffs)
• misc.cc (modified) (4 diffs)
• mod2.h.in (modified) (3 diffs)

Singular/febase.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.h,v 1.38 1999-09-21 14:44:58 obachman Exp $ */
+/* $Id: febase.h,v 1.39 1999-09-22 10:19:04 Singular Exp $ */
 /*
 * ABSTRACT: basic i/o
@@ -244 +244 @@
 /* the interface for reading: */
 extern  char * (*fe_fgets_stdin)(char *pr,char *s, int size);
+void fe_reset_input_mode();
 
 /* possible implementations: */

Singular/fegetopt.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: fegetopt.c,v 1.1 1999-09-20 18:03:47 obachman Exp $ */
+/* $Id: fegetopt.c,v 1.2 1999-09-22 10:19:04 Singular Exp $ */
 
 /* Getopt for GNU.
@@ -84 +84 @@
    they can distinguish the relative order of options and other arguments.  */
 
-#include "getopt.h"
+#include "fegetopt.h"
 
 /* For communication from `getopt' to the caller.

Singular/feread.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feread.cc,v 1.23 1999-09-20 18:03:48 obachman Exp $ */
+/* $Id: feread.cc,v 1.24 1999-09-22 10:19:04 Singular Exp $ */
 /*
 * ABSTRACT: input from ttys, simulating fgets
@@ -61 +61 @@
   return ((char *)NULL);
 }
-
-
-#endif
+#endif
+
 /* ===================================================================*/
 /* =                      static readline                           = */
@@ -126 +125 @@
 }
 
-void fe_reset_input_mode (void)
-{
-  char *p = getenv("SINGULARHIST");
-  if (p != NULL)
-  {
-    if(history_total_bytes()!=0)
-      write_history (p);
-  }
-}
-
 char * fe_fgets_stdin_rl(char *pr,char *s, int size)
 {
@@ -188 +177 @@
 }
 #endif
-
 
 /* ===================================================================*/
@@ -263 +251 @@
 }
 
-
 /* Attempt to complete on the contents of TEXT.  START and END show the
 *   region of TEXT that contains the word to complete.  We can use the
@@ -287 +274 @@
 }
 
-void fe_reset_input_mode (void)
-{
-  char *p = getenv("SINGULARHIST");
-  if (p != NULL)
-  {
-    if((*fe_history_total_bytes)()!=0)
-      (*fe_write_history) (p);
-  }
-}
-
 char * fe_fgets_stdin_drl(char *pr,char *s, int size)
 {
@@ -429 +406 @@
   return fgets(s,size,stdin);
 }
+
 #endif
 
@@ -439 +417 @@
   return NULL;
 }
+
+/* ===================================================================*/
+/* =          fe_reset_input_mode (all possibilities)               = */
+/* ===================================================================*/
+void fe_reset_input_mode ()
+{
+#if defined(HAVE_DYN_RL)
+  char *p = getenv("SINGULARHIST");
+  if (p != NULL)
+  {
+    if((*fe_history_total_bytes)()!=0)
+      (*fe_write_history) (p);
+  }
+#endif
+#if defined(HAVE_READLINE) && !defined(HAVE_FEREAD) && !defined(HAVE_DYN_RL)
+  char *p = getenv("SINGULARHIST");
+  if (p != NULL)
+  {
+    if(history_total_bytes()!=0)
+      write_history (p);
+  }
+#endif
+}
+

Singular/misc.cc

@@ -99 +99 @@
   }
   #endif
+  fe_reset_input_mode();
   if (i<=0)
   {
@@ -111 +112 @@
           printf("\n$Bye.\n");
       }
-    #ifndef macintosh
-      #ifdef HAVE_FEREAD
-        #ifdef HAVE_ATEXIT
-          //fe_reset_input_mode();
-        #else
-          //fe_reset_input_mode(0,NULL);
-        #endif
-      #else
-        #ifdef HAVE_READLINE
-          //fe_reset_input_mode();
-        #endif
-      #endif
-    #endif
     #ifdef sun
       #ifndef __svr4__
@@ -535 +523 @@
 #endif
 #if defined(HAVE_DYN_RL)
-              StringAppendS("d-readline,"
+              StringAppendS("d-readline,");
 #else
   #if defined(HAVE_READLINE) && !defined(FEREAD)
@@ -569 +557 @@
 #endif
 #ifdef HAVE_ASSUME
-             StringAppendS("ASSUME,"); 
+             StringAppendS("ASSUME,");
 #endif
 #ifdef MDEBUG

Singular/mod2.h.in

@@ -5 +5 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.66 1999-08-25 16:02:48 Singular Exp $
+ *  Version: $Id: mod2.h.in,v 1.67 1999-09-22 10:19:05 Singular Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -146 +146 @@
  ******************************************************************/
 /* define to use the dynamic linking of readline in non-distributions builds */
-/* #undef USE_DYN_RL */
+/* #undef USE_STATIC_RL */
 
 /* Default value for timer resolution in ticks per second */
@@ -204 +204 @@
 /* dynamic readline or readline ? */
 #ifdef HAVE_DL
-  #if defined(MAKE_DISTRIBUTION) || defined(USE_DYN_RL)
+  #if !defined(USE_STATIC_RL)
     #define HAVE_DYN_RL
   #endif