Changeset 65041c in git for kernel

Timestamp:

Oct 12, 2016, 11:23:29 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

54d5229170cefd9fd9156ac39f061d309f193b57

Parents:

6865a515676783a93fc67ca4c11e6931b8df506a

Message:

additional tests for unusual tty configurations, error msg for -b

File:

• kernel/oswrapper/fereadl.c (modified) (2 diffs)

kernel/oswrapper/fereadl.c

@@ -141 +141 @@
   return c;
 }
-void fe_init (void)
+static void fe_init (void)
 {
   fe_is_initialized=TRUE;
@@ -158 +158 @@
     {
       fe_stdout_is_tty=0;
-      fe_echo = fopen( ttyname(fileno(stdin)), "w" );
+      char *tty_name=ttyname(fileno(stdin));
+      if (tty_name!=NULL)
+        fe_echo = fopen( tty_name, "w" );
+      else
+        fe_echo = NULL;
+      if (fe_echo==NULL)
+      {
+        fe_echo=stdout;
+        printf("stdin is a tty, but ttyname fails\n");
+        return;
+      }
     }
     /* Save the terminal attributes so we can restore them later. */