Changeset eacca4 in git for kernel

Timestamp:

Jan 11, 2022, 11:50:30 AM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5d4dff6b68be525f37108c56b442972d6d093258

Parents:

676e2a091749a42bee06cf6f1c818c7058262096

Message:

singularhist-> singularhistory and using_history_called

Location:

kernel/oswrapper

Files:

• feread.cc (modified) (4 diffs)
• feread.h (modified) (1 diff)
• fereadl.c (modified) (4 diffs)

kernel/oswrapper/feread.cc

@@ -102 +102 @@
 
 extern "C" {
+  VAR BOOLEAN using_history_called=FALSE;
   typedef char * (*RL_PROC)(const char*,int);
   #ifdef READLINE_READLINE_H_OK
@@ -362 +363 @@
   }
 
+  using_history_called=FALSE;
   if(isatty(fileno(stdin)))
   {
     /* try to read a history */
+    using_history_called=TRUE;
     using_history();
     char *p = getenv("SINGULARHIST");
@@ -384 +387 @@
   /* do dynamic loading */
   int res=fe_init_dyn_rl();
+  using_history_called=FALSE;
   if (res!=0)
   {
@@ -407 +411 @@
     /* try to read a history */
     (*fe_using_history)();
+    using_history_called=TRUE;
     char *p = getenv("SINGULARHIST");
     if (p != NULL)

kernel/oswrapper/feread.h

@@ -9 +9 @@
 
 EXTERN_VAR char    prompt_char; /*1 either '>' or '.'*/
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+EXTERN_VAR BOOLEAN using_history_called; /*1 either '>' or '.'*/
+#ifdef __cplusplus
+}
+#endif
 
-#define SINGULARHIST_FILE ".singularhist"
+#define SINGULARHIST_FILE (char*)".singularhistory"
 
 #ifdef __cplusplus

kernel/oswrapper/fereadl.c

@@ -798 +798 @@
     break;
   }
+  using_history_called=FALSE;
   if (res!=0) dynl_close(fe_rl_hdl);
   else
@@ -808 +809 @@
     (*fe_rl_attempted_completion_function) = (CPPFunction *)singular_completion;
     /* try to read a history */
+    using_history_called=TRUE;
     (*fe_using_history)();
     p = getenv("SINGULARHIST");
-    if (p != NULL)
+    if (p==NULL) p=SINGULARHIST_FILE;
+    if (strlen(p) != 0)
     {
       (*fe_read_history) (p);
@@ -833 +836 @@
   if ((strlen(p) != 0) && (fe_history_total_bytes != NULL))
   {
-    if((*fe_history_total_bytes)()!=0)
+    if((using_history_called && (*fe_history_total_bytes)()!=0))
       (*fe_write_history) (p);
   }
@@ -841 +844 @@
   if (strlen(p) != 0)
   {
-    if(history_total_bytes()!=0)
+    if(using_history_called &&(history_total_bytes()!=0))
       write_history (p);
   }