Mercurial > octave

diff libinterp/corefcn/toplev.cc @ 21899:7c053ad1c7ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hide sys/select header * liboctave/wrappers/wait-for-input.c, liboctave/wrappers/wait-for-input.h: New files. * liboctave/wrappers/module.mk: Update. * toplev.cc: Use new octave_wait_for_input function.
author John W. Eaton <jwe@octave.org>
date Tue, 14 Jun 2016 13:43:17 -0400
parents bfc662ee0340
children 98f5dd2ff29a
line wrap: on
line diff
--- a/libinterp/corefcn/toplev.cc	Tue Jun 14 10:32:24 2016 -0700
+++ b/libinterp/corefcn/toplev.cc	Tue Jun 14 13:43:17 2016 -0400
@@ -35,8 +35,6 @@
 #include <sstream>
 #include <string>
 
-#include <sys/select.h>
-
 #include "cmd-edit.h"
 #include "cmd-hist.h"
 #include "file-ops.h"
@@ -48,6 +46,7 @@
 #include "quit.h"
 #include "singleton-cleanup.h"
 #include "str-vec.h"
+#include "wait-for-input.h"
 
 #include "build-env.h"
 #include "liboctinterp-build-info.h"
@@ -992,28 +991,6 @@
 
 // Execute a shell command.
 
-static int
-wait_for_input (int fid)
-{
-  int retval = -1;
-
-#if defined (HAVE_SELECT)
-  if (fid >= 0)
-    {
-      fd_set set;
-
-      FD_ZERO (&set);
-      FD_SET (fid, &set);
-
-      retval = gnulib::select (FD_SETSIZE, &set, 0, 0, 0);
-    }
-#else
-  retval = 1;
-#endif
-
-  return retval;
-}
-
 static octave_value_list
 run_command_and_return_output (const std::string& cmd_str)
 {
@@ -1044,7 +1021,7 @@
             {
               cmd->clear ();
 
-              if (wait_for_input (fid) != 1)
+              if (octave_wait_for_input (fid) != 1)
                 break;
             }
           else