Changeset 3232 for trunk/essentials/app-shells/bash/lib

Timestamp:

Apr 29, 2007, 10:43:43 PM (18 years ago)

Author:

bird

Message:

Applied Brendan's patches.

Location:

trunk/essentials/app-shells/bash/lib

Files:

• readline/input.c (modified) (1 diff)
• readline/readline.c (modified) (2 diffs)
• sh/netconn.c (modified) (1 diff)

trunk/essentials/app-shells/bash/lib/readline/input.c

@@ -443 +443 @@
   unsigned char c;
 
+#if defined (__OS2__)
+  if (isatty (fileno (stream)) )
+    {
+      static const char *esq_seq[] =
+           { "\033[A", "\033[B", "\033[C", "\033[D"
+           , "\033[H", "\033[F" 
+           , "\033[4h" };
+      static const char *esq = NULL;
+      if (esq)
+        {
+          c = *esq++;
+          if (*esq == '\0')
+            esq = NULL;
+        } 
+      else
+        {
+          for (;;)
+            {
+              result = _read_kbd (0, 1, 0);
+              if (result == 0) 
+                {
+                   int no;
+                   result = _read_kbd (0, 1, 0);
+                   switch (result)
+                     {
+                       case 'H': no = 0; break; // Arrow Up 
+                       case 'P': no = 1; break; // Arrow Down
+                       case 'M': no = 2; break; // Arrow Left
+                       case 'K': no = 3; break; // Arrow Right
+                       case 'G': no = 4; break; // Home key
+                       case 'O': no = 5; break; // End key
+                       case 'R': no = 6; break; // Insert key
+                       default: continue;
+                     }
+                   esq = esq_seq[no];
+                   c = *esq++;
+                   break;
+                } 
+              else 
+                {
+                  if (result == 0x1A) 
+                    return (EOF); // Ctrl-Z
+                  c = result;
+                  break;
+                }
+            }
+        }
+      return (c);
+    }
+#endif
+  
   while (1)
     {

trunk/essentials/app-shells/bash/lib/readline/readline.c

@@ -172 +172 @@
    and the attributes include `echo'.  Look at rltty.c:prepare_terminal_settings
    for the code that sets it. */
+#if defined (__OS2__)
+int readline_echoing_p = 1;
+#else
 int readline_echoing_p = 0;
+#endif 
 
 /* Current prompt. */
@@ -1088 +1092 @@
   rl_bind_keyseq_if_unbound ("\033[H", rl_beg_of_line);
   rl_bind_keyseq_if_unbound ("\033[F", rl_end_of_line);
+#if defined (__OS2__)
+  rl_bind_keyseq_if_unbound ("\033[4h", rl_overwrite_mode);
+#endif
 
   rl_bind_keyseq_if_unbound ("\033OA", rl_get_previous_history);

trunk/essentials/app-shells/bash/lib/sh/netconn.c

@@ -39 +39 @@
 #if defined (HAVE_SYS_SOCKET_H) && defined (HAVE_GETPEERNAME) && !defined (SVR4_2)
 #  include <sys/socket.h>
+#endif
+
+#ifdef __OS2__
+typedef __socklen_t socklen_t;
 #endif