readline:

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

diff --git a/readline/histexpand.c b/readline/histexpand.c
index 392e6d38d9ec771b77019df9272fa42c62d9f22f..78da3e585a651983535fe672b05eadcaee09cfe1 100644 (file)
--- a/readline/histexpand.c
+++ b/readline/histexpand.c
@@ -7,7 +7,7 @@
 
    The 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 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 (at your option)
+   the Free Software Foundation; either version 2, or (at your option)

    any later version.
 
    The Library is distributed in the hope that it will be useful, but
    any later version.
 
    The Library is distributed in the hope that it will be useful, but


@@ -18,7 +18,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
 
 
 #define READLINE_LIBRARY
 


@@ -50,6 +50,9 @@
 #include "history.h"
 #include "histlib.h"
 
 #include "history.h"
 #include "histlib.h"
 

+#include "rlshell.h"
+#include "xmalloc.h"
+

 #define HISTORY_WORD_DELIMITERS                " \t\n;&()|<>"
 #define HISTORY_QUOTE_CHARACTERS       "\"'`"
 
 #define HISTORY_WORD_DELIMITERS                " \t\n;&()|<>"
 #define HISTORY_QUOTE_CHARACTERS       "\"'`"
 


@@ -60,15 +63,10 @@ static char *subst_rhs;
 static int subst_lhs_len;
 static int subst_rhs_len;
 
 static int subst_lhs_len;
 static int subst_rhs_len;
 

-static char *get_history_word_specifier ();
-static char *history_find_word ();
-
-extern int history_offset;
-
-extern char *single_quote ();
-static char *quote_breaks ();
+static char *get_history_word_specifier __P((char *, char *, int *));
+static char *history_find_word __P((char *, int));

 
 

-extern char *xmalloc (), *xrealloc ();
+static char *quote_breaks __P((char *));

 
 /* Variables exported by this file. */
 /* The character that represents the start of a history expansion
 
 /* Variables exported by this file. */
 /* The character that represents the start of a history expansion