Move readline to the readline/readline subdirectory

readline turns out to be a bit of a stumbling block for the project to
move gdbsupport (and then gdbserver) to the top-level.

The issue is that readline headers are intended to be included with
names like "readline/readline.h".  To support this, gdb effectively
adds a -I option pointing to the top-level source directory -- but,
importantly, this option is not used when the system readline is used.

For gdbsupport, a -I option like this would always be needed, but that
in turn would break the system readline case.  This was PR build/17077,
fixed in commit a8a5dbcab8df0b3a9e04745d4fe8d64740acb323.

Previously, we had discussed this on the gdb-patches list in terms of
removing readline from the tree

    https://sourceware.org/ml/gdb-patches/2019-09/msg00317.html

However, Eli expressed some concerns, and Joel did as well (off-list).

Given those concerns, and the fact that a patch-free local readline is
relatively new in gdb (it was locally patched for years), I changed my
mind and decided to handle this situation by moving the readline
sources down a level.

That is, upstream readline is now in readline/readline, and the
top-level readline directory just contains the minimal configury
needed to build that.

This fixes the problem because, when gdb unconditionally adds a
-I$(top_srcdir), this will not find readline headers.  A separate -I
will be needed instead, which is exactly what's needed for
--with-system-readline.

gdb/ChangeLog
2019-10-23  Tom Tromey  <tom@tromey.com>

	* Makefile.in (READLINE_DIR): Update.

gdb/doc/ChangeLog
2019-10-23  Tom Tromey  <tom@tromey.com>

	* Makefile.in (READLINE_DIR): Update.

readline/ChangeLog
2019-10-23  Tom Tromey  <tom@tromey.com>

	Move old contents to readline/ subdirectory.
	* aclocal.m4, configure, configure.ac, .gitignore, Makefile.am,
	Makefile.in, README: New files.

Change-Id: Ice156a2ee09ea68722b48f64d97146d7428ea9e4

1 files changed, 0 insertions, 440 deletions

diff --git a/readline/mbutil.c b/readline/mbutil.c
deleted file mode 100644
index 1771635..0000000
--- a/readline/mbutil.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* mbutil.c -- readline multibyte character utility functions */
-
-/* Copyright (C) 2001-2017 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library (Readline), a library
-   for reading lines of text with interactive input and history editing.      
-
-   Readline 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 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define READLINE_LIBRARY
-
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include "posixjmp.h"
-
-#if defined (HAVE_UNISTD_H)
-#  include <unistd.h>	   /* for _POSIX_VERSION */
-#endif /* HAVE_UNISTD_H */
-
-#if defined (HAVE_STDLIB_H)
-#  include <stdlib.h>
-#else
-#  include "ansi_stdlib.h"
-#endif /* HAVE_STDLIB_H */
-
-#include <stdio.h>
-#include <ctype.h>
-
-/* System-specific feature definitions and include files. */
-#include "rldefs.h"
-#include "rlmbutil.h"
-
-#if defined (TIOCSTAT_IN_SYS_IOCTL)
-#  include <sys/ioctl.h>
-#endif /* TIOCSTAT_IN_SYS_IOCTL */
-
-/* Some standard library routines. */
-#include "readline.h"
-
-#include "rlprivate.h"
-#include "xmalloc.h"
-
-/* Declared here so it can be shared between the readline and history
-   libraries. */
-#if defined (HANDLE_MULTIBYTE)
-int rl_byte_oriented = 0;
-#else
-int rl_byte_oriented = 1;
-#endif
-
-/* Ditto */
-int _rl_utf8locale = 0;
-
-/* **************************************************************** */
-/*								    */
-/*		Multibyte Character Utility Functions		    */
-/*								    */
-/* **************************************************************** */
-
-#if defined(HANDLE_MULTIBYTE)
-
-/* **************************************************************** */
-/*								    */
-/*		UTF-8 specific Character Utility Functions	    */
-/*								    */
-/* **************************************************************** */
-
-/* Return the length in bytes of the possibly-multibyte character beginning
-   at S. Encoding is UTF-8. */
-static int
-_rl_utf8_mblen (const char *s, size_t n)
-{
-  unsigned char c, c1;
-
-  if (s == 0)
-    return (0);	/* no shift states */
-  if (n <= 0)
-    return (-1);
-
-  c = (unsigned char)*s;
-  if (c < 0x80)
-    return (c != 0);
-  if (c >= 0xc2)
-    {
-      c1 = (unsigned char)s[1];
-      if (c < 0xe0)
-	{
-	  if (n >= 2 && (s[1] ^ 0x80) < 0x40)
-	    return 2;
-	}
-      else if (c < 0xf0)
-	{
-	  if (n >= 3
-		&& (s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		&& (c >= 0xe1 || c1 >= 0xa0)
-		&& (c != 0xed || c1 < 0xa0))
-	    return 3;
-	}
-      else if (c < 0xf8)
-	{
-	  if (n >= 4
-		&& (s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-	 	&& (s[3] ^ 0x80) < 0x40
-		&& (c >= 0xf1 || c1 >= 0x90)
-		&& (c < 0xf4 || (c == 0xf4 && c1 < 0x90)))
-	    return 4;
-	}
-    }
-  /* invalid or incomplete multibyte character */
-  return -1;
-}
-
-static int
-_rl_find_next_mbchar_internal (char *string, int seed, int count, int find_non_zero)
-{
-  size_t tmp, len;
-  mbstate_t ps;
-  int point;
-  wchar_t wc;
-
-  tmp = 0;
-
-  memset(&ps, 0, sizeof (mbstate_t));
-  if (seed < 0)
-    seed = 0;
-  if (count <= 0)
-    return seed;
-
-  point = seed + _rl_adjust_point (string, seed, &ps);
-  /* if _rl_adjust_point returns -1, the character or string is invalid.
-     treat as a byte. */
-  if (point == seed - 1)	/* invalid */
-    return seed + 1;
-    
-  /* if this is true, means that seed was not pointing to a byte indicating
-     the beginning of a multibyte character.  Correct the point and consume
-     one char. */
-  if (seed < point)
-    count--;
-
-  while (count > 0)  
-    {
-      len = strlen (string + point);
-      if (len == 0)
-	break;
-      if (_rl_utf8locale && UTF8_SINGLEBYTE(string[point]))
-	{
-	  tmp = 1;
-	  wc = (wchar_t) string[point];
-	  memset(&ps, 0, sizeof(mbstate_t));
-	}
-      else
-	tmp = mbrtowc (&wc, string+point, len, &ps);
-      if (MB_INVALIDCH ((size_t)tmp))
-	{
-	  /* invalid bytes. assume a byte represents a character */
-	  point++;
-	  count--;
-	  /* reset states. */
-	  memset(&ps, 0, sizeof(mbstate_t));
-	}
-      else if (MB_NULLWCH (tmp))
-	break;			/* found wide '\0' */
-      else
-	{
-	  /* valid bytes */
-	  point += tmp;
-	  if (find_non_zero)
-	    {
-	      if (WCWIDTH (wc) == 0)
-		continue;
-	      else
-		count--;
-	    }
-	  else
-	    count--;
-	}
-    }
-
-  if (find_non_zero)
-    {
-      tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
-      while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && WCWIDTH (wc) == 0)
-	{
-	  point += tmp;
-	  tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
-	}
-    }
-
-  return point;
-}
-
-/*static*/ int
-_rl_find_prev_mbchar_internal (char *string, int seed, int find_non_zero)
-{
-  mbstate_t ps;
-  int prev, non_zero_prev, point, length;
-  size_t tmp;
-  wchar_t wc;
-
-  memset(&ps, 0, sizeof(mbstate_t));
-  length = strlen(string);
-  
-  if (seed < 0)
-    return 0;
-  else if (length < seed)
-    return length;
-
-  prev = non_zero_prev = point = 0;
-  while (point < seed)
-    {
-      if (_rl_utf8locale && UTF8_SINGLEBYTE(string[point]))
-	{
-	  tmp = 1;
-	  wc = (wchar_t) string[point];
-	  memset(&ps, 0, sizeof(mbstate_t));
-	}
-      else
-	tmp = mbrtowc (&wc, string + point, length - point, &ps);
-      if (MB_INVALIDCH ((size_t)tmp))
-	{
-	  /* in this case, bytes are invalid or too short to compose
-	     multibyte char, so assume that the first byte represents
-	     a single character anyway. */
-	  tmp = 1;
-	  /* clear the state of the byte sequence, because
-	     in this case effect of mbstate is undefined  */
-	  memset(&ps, 0, sizeof (mbstate_t));
-
-	  /* Since we're assuming that this byte represents a single
-	     non-zero-width character, don't forget about it. */
-	  prev = point;
-	}
-      else if (MB_NULLWCH (tmp))
-	break;			/* Found '\0' char.  Can this happen? */
-      else
-	{
-	  if (find_non_zero)
-	    {
-	      if (WCWIDTH (wc) != 0)
-		prev = point;
-	    }
-	  else
-	    prev = point;  
-	}
-
-      point += tmp;
-    }
-
-  return prev;
-}
-
-/* return the number of bytes parsed from the multibyte sequence starting
-   at src, if a non-L'\0' wide character was recognized. It returns 0, 
-   if a L'\0' wide character was recognized. It  returns (size_t)(-1), 
-   if an invalid multibyte sequence was encountered. It returns (size_t)(-2) 
-   if it couldn't parse a complete  multibyte character.  */
-int
-_rl_get_char_len (char *src, mbstate_t *ps)
-{
-  size_t tmp, l;
-  int mb_cur_max;
-
-  /* Look at no more than MB_CUR_MAX characters */
-  l = (size_t)strlen (src);
-  if (_rl_utf8locale && l > 0 && UTF8_SINGLEBYTE(*src))
-    tmp = (*src != 0) ? 1 : 0;
-  else
-    {
-      mb_cur_max = MB_CUR_MAX;
-      tmp = mbrlen((const char *)src, (l < mb_cur_max) ? l : mb_cur_max, ps);
-    }
-  if (tmp == (size_t)(-2))
-    {
-      /* too short to compose multibyte char */
-      if (ps)
-	memset (ps, 0, sizeof(mbstate_t));
-      return -2;
-    }
-  else if (tmp == (size_t)(-1))
-    {
-      /* invalid to compose multibyte char */
-      /* initialize the conversion state */
-      if (ps)
-	memset (ps, 0, sizeof(mbstate_t));
-      return -1;
-    }
-  else if (tmp == (size_t)0)
-    return 0;
-  else
-    return (int)tmp;
-}
-
-/* compare the specified two characters. If the characters matched,
-   return 1. Otherwise return 0. */
-int
-_rl_compare_chars (char *buf1, int pos1, mbstate_t *ps1, char *buf2, int pos2, mbstate_t *ps2)
-{
-  int i, w1, w2;
-
-  if ((w1 = _rl_get_char_len (&buf1[pos1], ps1)) <= 0 || 
-	(w2 = _rl_get_char_len (&buf2[pos2], ps2)) <= 0 ||
-	(w1 != w2) ||
-	(buf1[pos1] != buf2[pos2]))
-    return 0;
-
-  for (i = 1; i < w1; i++)
-    if (buf1[pos1+i] != buf2[pos2+i])
-      return 0;
-
-  return 1;
-}
-
-/* adjust pointed byte and find mbstate of the point of string.
-   adjusted point will be point <= adjusted_point, and returns
-   differences of the byte(adjusted_point - point).
-   if point is invalid (point < 0 || more than string length),
-   it returns -1 */
-int
-_rl_adjust_point (char *string, int point, mbstate_t *ps)
-{
-  size_t tmp;
-  int length, pos;
-
-  tmp = 0;
-  pos = 0;
-  length = strlen(string);
-  if (point < 0)
-    return -1;
-  if (length < point)
-    return -1;
-  
-  while (pos < point)
-    {
-      if (_rl_utf8locale && UTF8_SINGLEBYTE(string[pos]))
-	tmp = 1;
-      else
-	tmp = mbrlen (string + pos, length - pos, ps);
-      if (MB_INVALIDCH ((size_t)tmp))
-	{
-	  /* in this case, bytes are invalid or too short to compose
-	     multibyte char, so assume that the first byte represents
-	     a single character anyway. */
-	  pos++;
-	  /* clear the state of the byte sequence, because
-	     in this case effect of mbstate is undefined  */
-	  if (ps)
-	    memset (ps, 0, sizeof (mbstate_t));
-	}
-      else if (MB_NULLWCH (tmp))
-	pos++;
-      else
-	pos += tmp;
-    }
-
-  return (pos - point);
-}
-
-int
-_rl_is_mbchar_matched (char *string, int seed, int end, char *mbchar, int length)
-{
-  int i;
-
-  if ((end - seed) < length)
-    return 0;
-
-  for (i = 0; i < length; i++)
-    if (string[seed + i] != mbchar[i])
-      return 0;
-  return 1;
-}
-
-wchar_t
-_rl_char_value (char *buf, int ind)
-{
-  size_t tmp;
-  wchar_t wc;
-  mbstate_t ps;
-  int l;
-
-  if (MB_LEN_MAX == 1 || rl_byte_oriented)
-    return ((wchar_t) buf[ind]);
-  if (_rl_utf8locale && UTF8_SINGLEBYTE(buf[ind]))
-    return ((wchar_t) buf[ind]);
-  l = strlen (buf);
-  if (ind >= l - 1)
-    return ((wchar_t) buf[ind]);
-  if (l < ind)			/* Sanity check */
-    l = strlen (buf+ind);
-  memset (&ps, 0, sizeof (mbstate_t));
-  tmp = mbrtowc (&wc, buf + ind, l - ind, &ps);
-  if (MB_INVALIDCH (tmp) || MB_NULLWCH (tmp))  
-    return ((wchar_t) buf[ind]);
-  return wc;
-}
-#endif /* HANDLE_MULTIBYTE */
-
-/* Find next `count' characters started byte point of the specified seed.
-   If flags is MB_FIND_NONZERO, we look for non-zero-width multibyte
-   characters. */
-#undef _rl_find_next_mbchar
-int
-_rl_find_next_mbchar (char *string, int seed, int count, int flags)
-{
-#if defined (HANDLE_MULTIBYTE)
-  return _rl_find_next_mbchar_internal (string, seed, count, flags);
-#else
-  return (seed + count);
-#endif
-}
-
-/* Find previous character started byte point of the specified seed.
-   Returned point will be point <= seed.  If flags is MB_FIND_NONZERO,
-   we look for non-zero-width multibyte characters. */
-#undef _rl_find_prev_mbchar
-int
-_rl_find_prev_mbchar (char *string, int seed, int flags)
-{
-#if defined (HANDLE_MULTIBYTE)
-  return _rl_find_prev_mbchar_internal (string, seed, flags);
-#else
-  return ((seed == 0) ? seed : seed - 1);
-#endif
-}