[5597] init interactive tests fix; remove prototype

[Gavin D. Smith]

Revision: 5597
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5597
Author:   gavin
Date:     2014-05-22 22:21:25 +0000 (Thu, 22 May 2014)
Log Message:
-----------
init interactive tests fix; remove prototype

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/t/Init-intera.inc
    trunk/info/window.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-22 22:03:09 UTC (rev 5596)
+++ trunk/ChangeLog     2014-05-22 22:21:25 UTC (rev 5597)
@@ -1,5 +1,10 @@
 2014-05-21  Gavin Smith  <address@hidden>
 
+       * info/t/Init-intera.inc: Account for incomplete output from
+       pseudotty.
+
+2014-05-21  Gavin Smith  <address@hidden>
+
        * info/indices.c (info_index_apropos): Use text_buffer_* functions
        directly.  Don't create apropos window if nothing found.
        * info/infodoc.c (dump_map_to_message_buffer)

Modified: trunk/info/t/Init-intera.inc
===================================================================
--- trunk/info/t/Init-intera.inc        2014-05-22 22:03:09 UTC (rev 5596)
+++ trunk/info/t/Init-intera.inc        2014-05-22 22:21:25 UTC (rev 5597)
@@ -20,16 +20,19 @@
        # Sleep for 1 ms if usleep is available
        usleep 1000 2>/dev/null || sleep 1
 done
-PTS_DEVICE="$(cat $GINFO_PTY_FILE | tr -d '\n')"
-rm -f $GINFO_PTY_FILE
 
-# Wait for pts device file to actually appear.  This shouldn't be
-# necessary, but occasionally we get a "no such file or directory"
-# error when we redirect the file descriptors below.
-while test ! -c $PTS_DEVICE
+# Wait for file to actually appear, and to contain a
+# valid name of a device file.
+while :
 do
+       PTS_DEVICE="$(cat $GINFO_PTY_FILE | tr -d '\n')"
+       if test -c "$PTS_DEVICE"
+       then
+               break
+       fi
        usleep 1000 2>/dev/null || sleep 1
 done
+rm -f $GINFO_PTY_FILE
 
 echo "Redirecting standard file descriptors to $PTS_DEVICE."
 exec 0>$PTS_DEVICE 1<&0 2<&0

Modified: trunk/info/window.h
===================================================================
--- trunk/info/window.h 2014-05-22 22:03:09 UTC (rev 5596)
+++ trunk/info/window.h 2014-05-22 22:21:25 UTC (rev 5597)
@@ -232,9 +232,6 @@
 
 /* Calculate a list of line starts for the node belonging to WINDOW.  The line
    starts are offsets within WINDOW->node. */
-extern void calculate_line_starts (WINDOW *window);
-
-/* Given WINDOW, recalculate the line starts for the node it displays. */
 extern void recalculate_line_starts (WINDOW *window);
 
 /* Return the index of the line containing point. */