Changeset 5ad50e in git for kernel

Timestamp:

Oct 13, 2016, 1:52:44 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0750b0232fb64224c4524f35243e993f0bbfc3fa

Parents:

2f0e59ef2bb6687c4bd3dca4c82a1d6283b28dec

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-10-13 13:52:44+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-10-13 13:53:27+02:00

Message:

fix for readline7: fix tr. #776

use fgets instead of readline if stdin is not a tty

Location:

kernel/oswrapper

Files:

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

kernel/oswrapper/feread.cc

@@ -342 +342 @@
       rl_outstream = fopen( "/dev/tty", "w" );
     #else
-      rl_outstream = fopen( ttyname(fileno(stdout)), "w" );
+      char *fn=ttyname(fileno(stdin));//if stdout is not a tty, maybe stdin is?
+      if (fn!=NULL) rl_outstream = fopen( fn, "w" );
     #endif
   }
 
-  /* try to read a history */
-  using_history();
-  char *p = getenv("SINGULARHIST");
-  if (p != NULL)
-  {
-    read_history (p);
-  }
-  fe_fgets_stdin=fe_fgets_stdin_rl;
-  return(fe_fgets_stdin_rl(pr,s,size));
+  if(isatty(fileno(stdin)))
+  {
+    /* try to read a history */
+    using_history();
+    char *p = getenv("SINGULARHIST");
+    if (p != NULL)
+    {
+      read_history (p);
+    }
+    fe_fgets_stdin=fe_fgets_stdin_rl;
+    return(fe_fgets_stdin_rl(pr,s,size));
+  }
+  else
+  {
+    fe_fgets_stdin=fe_fgets;
+    return(fe_fgets(pr,s,size));
+  }
 #endif
 #ifdef HAVE_DYN_RL
@@ -374 +383 @@
     return fe_fgets_stdin(pr,s,size);
   }
-  else /* could load libreadline: */
+  else if (isatty(STDIN_FILENO))/*and could load libreadline: */
   {
     /* Allow conditional parsing of the ~/.inputrc file. */
@@ -387 +396 @@
       (*fe_read_history) (p);
     }
-  }
-
-  /* set the output stream */
-  if(!isatty(STDOUT_FILENO))
-  {
-    #ifdef atarist
-      *fe_rl_outstream = fopen( "/dev/tty", "w" );
-    #else
-      *fe_rl_outstream = fopen( ttyname(fileno(stdout)), "w" );
-    #endif
-  }
-
-  fe_fgets_stdin=fe_fgets_stdin_drl;
-  return fe_fgets_stdin_drl(pr,s,size);
+
+    /* set the output stream */
+    if(!isatty(STDOUT_FILENO))
+    {
+      #ifdef atarist
+        *fe_rl_outstream = fopen( "/dev/tty", "w" );
+      #else
+        char *fn=ttyname(fileno(stdin));//if stdout is not a tty, maybe stdin is?
+        if (fn!=NULL) *fe_rl_outstream = fopen( fn, "w" );
+      #endif
+    }
+    fe_fgets_stdin=fe_fgets_stdin_drl;
+    return fe_fgets_stdin_drl(pr,s,size);
+  }
+  else
+  {
+    fe_fgets_stdin=fe_fgets;
+    return fe_fgets(pr,s,size);
+  }
 #else
   #if !defined(HAVE_READLINE) && defined(HAVE_FEREAD)

kernel/oswrapper/fereadl.c

@@ -804 +804 @@
     fe_read_history=dynl_sym(fe_rl_hdl,"read_history");
     if (fe_read_history==NULL) { res=14; break; }
-    return 0;
-  }
-  dynl_close(fe_rl_hdl);
-  if (res==0)
+    break;
+  }
+  if (res!=0) dynl_close(fe_rl_hdl);
+  else
   {
     char *p;