Changeset 65041c in git

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

Files:

• Singular/feOpt.cc (modified) (1 diff)
• Singular/feOptTab.h (modified) (1 diff)
• Singular/fevoices.cc (modified) (1 diff)
• Singular/tesths.cc (modified) (2 diffs)
• kernel/oswrapper/fereadl.c (modified) (2 diffs)

Singular/feOpt.cc

@@ -225 +225 @@
 
       case FE_OPT_NO_TTY:
-#if defined(HAVE_FEREAD) || defined(HAVE_READLINE)
         if (feOptSpec[FE_OPT_NO_TTY].value)
           fe_fgets_stdin=fe_fgets;
-#endif
         return NULL;
 

Singular/feOptTab.h

@@ -73 +73 @@
 
   {"batch",             no_argument,        'b',
-   0,          "Run in batch mode",                                    feOptBool,    0,     0},
+   0,          "Run in batch mode (requires --link/--MPhost/--MPport)",                                    feOptBool,    0,     0},
 
   {"execute",           required_argument,  'c',

Singular/fevoices.cc

@@ -668 +668 @@
     p->files=freopen("/dev/tty","r",stdin);
     //stdin=p->files;
-    p->sw = BI_stdin;
+    if (p->files==NULL)
+    {
+      p->files = stdin;
+      p->sw = BI_file;
+    }
+    else
+      p->sw = BI_stdin;
   }
   p->filename   = omStrDup("STDIN");

Singular/tesths.cc

@@ -157 +157 @@
   countedref_init();
 #endif
-// #ifdef HAVE_FANS
-//   bbcone_setup();
-//   bbpolytope_setup();
-//   bbfan_setup();
-//   gitfan_setup();
-// #endif /* HAVE_FANS */
   errorreported = 0;
 
@@ -229 +223 @@
       //exit(0);
     }
+    else
+    {
+      Print("** missing arguments: -b requires --link/--MPhost/--MPport\n");
+      return 1;
+    }
   }
   setjmp(si_start_jmpbuf);

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. */