Changeset 2619 for trunk/texinfo/info

Timestamp:

Mar 12, 2006, 6:02:46 PM (19 years ago)

Author:

bird

Message:

applied OS/2 patches (manually).

Location:

trunk/texinfo/info

Files:

• echo-area.c (modified) (3 diffs)
• filesys.h (modified) (1 diff)
• man.c (modified) (2 diffs)
• session.c (modified) (13 diffs)
• terminal.c (modified) (8 diffs)

trunk/texinfo/info/echo-area.c

@@ -592 +592 @@
 
     counter = input_line_end - input_line_point;
-    
+
     for (i = input_line_point - len; counter; i++, counter--)
       input_line[i] = input_line[i + len];
@@ -894 +894 @@
   return (line);
 }
-  
+
 /* Read a line in the echo area with completion over COMPLETIONS. */
 char *
@@ -1488 +1488 @@
 pause_or_input (void)
 {
-#ifdef FD_SET
+#if defined(FD_SET) && !defined(__INNOTEK_LIBC__)
   struct timeval timer;
   fd_set readfds;

trunk/texinfo/info/filesys.h

@@ -79 +79 @@
 /* The default value of INFOPATH. */
 #if !defined (DEFAULT_INFOPATH)
-#  define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
+#  ifndef __EMX__
+#    define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
+#  else
+#    define DEFAULT_INFOPATH ".;/usr/local/info;/usr/info;/usr/local/lib/info;/usr/lib/info;/usr/local/gnu/info;/usr/local/gnu/lib/info;/usr/gnu/info;/usr/gnu/lib/info;/opt/gnu/info;/usr/share/info;/usr/share/lib/info;/usr/local/share/info;/usr/local/share/lib/info;/usr/gnu/lib/emacs/info;/usr/local/gnu/lib/emacs/info;/usr/local/lib/emacs/info;/usr/local/emacs/info;/emx/info;"
+#  endif /* __EMX__ */
 #endif /* !DEFAULT_INFOPATH */
 

trunk/texinfo/info/man.c

@@ -33 +33 @@
 #include "tilde.h"
 #include "man.h"
+
+#ifdef __EMX__
+# include <process.h>
+# include <sys/wait.h>
+# undef PIPE_USE_FORK
+#endif
 
 #if !defined (_POSIX_VERSION)
@@ -471 +477 @@
   int bindex = 0;
   int select_result;
-#if defined (FD_SET)
+#if defined (FD_SET) && !defined (__INNOTEK__LIBC__)
   fd_set read_fds;
 

trunk/texinfo/info/session.c

@@ -24 +24 @@
 #include "search.h"
 #include <sys/ioctl.h>
+
+#ifdef __EMX__
+#  include <stdlib.h>
+#  include "pc.h"
+#endif /* __EMX__ */
 
 #if defined (HAVE_SYS_TIME_H)
@@ -1994 +1999 @@
    prefer the one forward.  The return is in newly-allocated memory,
    since the caller frees it.
-   
+
    This is called from info_menu_or_ref_item with XREF_LIST being all
    the xrefs in the node, and POS being point.  The ui function that
@@ -2009 +2014 @@
   int nearest = -1;
   long best_delta = -1;
-  
+
   for (this_xref = 0; xref_list[this_xref]; this_xref++)
     {
@@ -2019 +2024 @@
           break;
         }
-      
+
       /* See how far POS is from this xref.  Take into account the
          `*Note' that begins the xref, since as far as the user is
@@ -2025 +2030 @@
       delta = MIN (labs (pos - (xref->start - strlen (INFO_XREF_LABEL))),
                    labs (pos - xref->end));
-      
+
       /* It's the <= instead of < that makes us choose the forward xref
          of POS if two are equidistant.  Of course, because of all the
@@ -2036 +2041 @@
         }
     }
-  
+
   /* Maybe there was no list to search through.  */
   if (nearest < 0)
     return NULL;
-  
+
   /* Ok, we have a nearest xref, make a list of it.  */
   {
@@ -3299 +3304 @@
 
 #if !defined (DEFAULT_INFO_PRINT_COMMAND)
+# ifndef __EMX__
 #  define DEFAULT_INFO_PRINT_COMMAND "lpr"
+# else
+#  define DEFAULT_INFO_PRINT_COMMAND "expand --tabs=4 >>InfoLog.tmp"
+# endif /* __EMX__ */
 #endif /* !DEFAULT_INFO_PRINT_COMMAND */
 
@@ -4114 +4123 @@
             break;
           }
-      
+
 
       if (search_result == 0)
@@ -4575 +4584 @@
           !info_input_pending_p ())
         {
-#if defined (FD_SET)
+#if defined (FD_SET) && !defined (__EMX__)
           struct timeval timer;
           fd_set readfds;
@@ -4924 +4933 @@
   space_avail = info_input_buffer_space_available ();
 
+#ifdef __EMX__
+  if ( is_xfree86 == XFREE86_NO )
+    {
+      while (chars_avail < space_avail && (tty = pc_getc(0)) != -1)
+        input[chars_avail++] = tty;
+    }
+  else
+    {
+#endif /* __EMX__ */
   /* If we can just find out how many characters there are to read, do so. */
 #if defined (FIONREAD)
@@ -4976 +4994 @@
 #  endif /* O_NDELAY */
 #endif /* !FIONREAD */
+#ifdef __EMX__
+    }
+#endif /* __EMX__ */
 
   while (i < chars_avail)
@@ -5002 +5023 @@
       unsigned char c;
       int tty = fileno (info_input_stream);
+
+#ifdef __EMX__
+      if (is_xfree86 == XFREE86_NO)
+        keystroke = pc_getc(1);
+      else
+      {
+#endif /* __EMX__ */
 
       /* Using stream I/O causes FIONREAD etc to fail to work
@@ -5046 +5074 @@
             }
         }
+#ifdef __EMX__
+      }
+#endif /* __EMX__ */
     }
 

trunk/texinfo/info/terminal.c

@@ -24 +24 @@
 #include "terminal.h"
 #include "termdep.h"
+#ifdef __EMX__
+#  include <stdlib.h>
+#  include "pc.h"
+#endif /* __EMX__ */
 
 #include <sys/types.h>
@@ -135 +139 @@
   if (term_keypad_on)
       send_to_terminal (term_keypad_on);
-  
+
   if (!term_begin_use || !*term_begin_use)
     return;
 
 #ifdef SIGWINCH
-  sigsave = signal (SIGWINCH, SIG_IGN); 
+  sigsave = signal (SIGWINCH, SIG_IGN);
 #endif
 
@@ -166 +170 @@
   if (term_keypad_off)
       send_to_terminal (term_keypad_off);
-  
+
   if (!term_end_use || !*term_end_use)
     return;
@@ -460 +464 @@
       screenwidth = screenheight = 0;
 
+#ifdef __EMX__
+      {
+        int s[2];
+        _scrsize (s);
+        screenwidth = s[0];
+        screenheight = s[1];
+        if (getenv ("WINDOWID"))
+          {
+             FILE *fd = popen ("scrsize","rt");
+             if (fd)
+               {
+                 fscanf (fd, "%i %i", &screenwidth, &screenheight);
+                 pclose (fd);
+               }
+          }
+      }
+#endif /* __EMX__ */
+
 #if defined (TIOCGWINSZ)
       {
@@ -705 +727 @@
 
   tty = fileno (stdin);
+
+#ifdef __EMX__
+  if (is_xfree86 == XFREE86_NO)
+    pc_init ();
+  else
+  {
+#endif /* __EMX__ */
 
 #if defined (HAVE_TERMIOS_H)
@@ -827 +856 @@
   ioctl (tty, TIOCSETN, &ttybuff);
 #endif /* !HAVE_TERMIOS_H && !HAVE_TERMIO_H */
+#ifdef __EMX__
+  }
+#endif /* __EMX__ */
 }
 
@@ -843 +875 @@
 
   tty = fileno (stdin);
+
+#ifdef __EMX__
+  if ( is_xfree86 == XFREE86_NO )
+    pc_exit ();
+  else
+  {
+#endif /* __EMX__ */
 
 #if defined (HAVE_TERMIOS_H)
@@ -868 +907 @@
 #  endif /* !HAVE_TERMIO_H */
 #endif /* !HAVE_TERMIOS_H */
+#ifdef __EMX__
+  }
+#endif /* __EMX__ */
   terminal_end_using_terminal ();
 }