Readline 5.1 import for HEAD.

[deliverable/binutils-gdb.git] / readline / shell.c

diff --git a/readline/shell.c b/readline/shell.c
index f0ddc897fe42cf0438dcec42ebf18daf9135e4f1..346f8113d43d742191f34f431d55e94316e4431d 100644 (file)
--- a/readline/shell.c
+++ b/readline/shell.c
@@ -8,7 +8,7 @@
 
    The GNU Readline Library is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public License
 
    The GNU Readline Library is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public License

-   as published by the Free Software Foundation; either version 1, or
+   as published by the Free Software Foundation; either version 2, or

    (at your option) any later version.
 
    The GNU Readline Library is distributed in the hope that it will be
    (at your option) any later version.
 
    The GNU Readline Library is distributed in the hope that it will be


@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,

-   675 Mass Ave, Cambridge, MA 02139, USA. */
+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)


@@ -27,7 +27,6 @@
 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>

-#include <stdio.h>

 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>


@@ -45,26 +44,59 @@
 #  include <strings.h>
 #endif /* !HAVE_STRING_H */
 
 #  include <strings.h>
 #endif /* !HAVE_STRING_H */
 

+#if defined (HAVE_LIMITS_H)
+#  include <limits.h>
+#endif
+
+#if defined (HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+#if defined (HAVE_PWD_H)

 #include <pwd.h>
 #include <pwd.h>

+#endif
+
+#include <stdio.h>
+
+#include "rlstdc.h"
+#include "rlshell.h"
+#include "xmalloc.h"
+
+#if defined (HAVE_GETPWUID) && !defined (HAVE_GETPW_DECLS)
+extern struct passwd *getpwuid PARAMS((uid_t));
+#endif /* HAVE_GETPWUID && !HAVE_GETPW_DECLS */
+
+#ifndef NULL
+#  define NULL 0
+#endif
+
+#ifndef CHAR_BIT
+#  define CHAR_BIT 8
+#endif

 
 

-#if !defined (HAVE_GETPW_DECLS)
-extern struct passwd *getpwuid ();
-#endif /* !HAVE_GETPW_DECLS */
+/* Nonzero if the integer type T is signed.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))

 
 

-extern char *xmalloc ();
+/* Bound on length of the string representing an integer value of type T.
+   Subtract one for the sign bit if T is signed;
+   302 / 1000 is log10 (2) rounded up;
+   add one for integer division truncation;
+   add one more for a minus sign if t is signed.  */
+#define INT_STRLEN_BOUND(t) \
+  ((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 1000 \
+   + 1 + TYPE_SIGNED (t))

 
 /* All of these functions are resolved from bash if we are linking readline
    as part of bash. */
 
 /* Does shell-like quoting using single quotes. */
 char *
 
 /* All of these functions are resolved from bash if we are linking readline
    as part of bash. */
 
 /* Does shell-like quoting using single quotes. */
 char *

-single_quote (string)
+sh_single_quote (string)

      char *string;
 {
   register int c;
   char *result, *r, *s;
 
      char *string;
 {
   register int c;
   char *result, *r, *s;
 

-  result = (char *)xmalloc (3 + (3 * strlen (string)));
+  result = (char *)xmalloc (3 + (4 * strlen (string)));

   r = result;
   *r++ = '\'';
 
   r = result;
   *r++ = '\'';
 


@@ -89,46 +121,88 @@ single_quote (string)
 /* Set the environment variables LINES and COLUMNS to lines and cols,
    respectively. */
 void
 /* Set the environment variables LINES and COLUMNS to lines and cols,
    respectively. */
 void

-set_lines_and_columns (lines, cols)
+sh_set_lines_and_columns (lines, cols)

      int lines, cols;
 {
   char *b;
 
      int lines, cols;
 {
   char *b;
 

-#if defined (HAVE_PUTENV)
-  b = xmalloc (24);
-  sprintf (b, "LINES=%d", lines);
-  putenv (b);
-  b = xmalloc (24);
-  sprintf (b, "COLUMNS=%d", cols);
-  putenv (b);
-#else /* !HAVE_PUTENV */
-#  if defined (HAVE_SETENV)
-  b = xmalloc (8);
+#if defined (HAVE_SETENV)
+  b = (char *)xmalloc (INT_STRLEN_BOUND (int) + 1);

   sprintf (b, "%d", lines);
   setenv ("LINES", b, 1);
   sprintf (b, "%d", lines);
   setenv ("LINES", b, 1);

-  b = xmalloc (8);
+  free (b);
+
+  b = (char *)xmalloc (INT_STRLEN_BOUND (int) + 1);

   sprintf (b, "%d", cols);
   setenv ("COLUMNS", b, 1);
   sprintf (b, "%d", cols);
   setenv ("COLUMNS", b, 1);

-#  endif /* HAVE_SETENV */
-#endif /* !HAVE_PUTENV */
+  free (b);
+#else /* !HAVE_SETENV */
+#  if defined (HAVE_PUTENV)
+  b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("LINES=") + 1);
+  sprintf (b, "LINES=%d", lines);
+  putenv (b);
+
+  b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("COLUMNS=") + 1);
+  sprintf (b, "COLUMNS=%d", cols);
+  putenv (b);
+#  endif /* HAVE_PUTENV */
+#endif /* !HAVE_SETENV */

 }
 
 char *
 }
 
 char *

-get_env_value (varname)
-     char *varname;
+sh_get_env_value (varname)
+     const char *varname;

 {
   return ((char *)getenv (varname));
 }
 
 char *
 {
   return ((char *)getenv (varname));
 }
 
 char *

-get_home_dir ()
+sh_get_home_dir ()

 {
   char *home_dir;
   struct passwd *entry;
 
   home_dir = (char *)NULL;
 {
   char *home_dir;
   struct passwd *entry;
 
   home_dir = (char *)NULL;

+#if defined (HAVE_GETPWUID)

   entry = getpwuid (getuid ());
   if (entry)
     home_dir = entry->pw_dir;
   entry = getpwuid (getuid ());
   if (entry)
     home_dir = entry->pw_dir;

+#endif

   return (home_dir);
 }
   return (home_dir);
 }

+
+#if !defined (O_NDELAY)
+#  if defined (FNDELAY)
+#    define O_NDELAY FNDELAY
+#  endif
+#endif
+
+int
+sh_unset_nodelay_mode (fd)
+     int fd;
+{
+#if defined (HAVE_FCNTL)
+  int flags, bflags;
+
+  if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
+    return -1;
+
+  bflags = 0;
+
+#ifdef O_NONBLOCK
+  bflags |= O_NONBLOCK;
+#endif
+
+#ifdef O_NDELAY
+  bflags |= O_NDELAY;
+#endif
+
+  if (flags & bflags)
+    {
+      flags &= ~bflags;
+      return (fcntl (fd, F_SETFL, flags));
+    }
+#endif
+
+  return 0;
+}