diff -urN readline-32-src/ansi_stdlib.h readline-src/ansi_stdlib.h --- readline-32-src/ansi_stdlib.h 2008-04-16 12:32:49.656250000 -0700 +++ readline-src/ansi_stdlib.h 2001-10-17 22:08:40.000000000 -0700 @@ -20,39 +20,35 @@ with Bash; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -//********************* CHANGED commented everything ********************* #if !defined (_STDLIB_H_) #define _STDLIB_H_ 1 -#include +/* String conversion functions. */ +extern int atoi (); + +extern double atof (); +extern double strtod (); + +/* Memory allocation functions. */ +/* Generic pointer type. */ +#ifndef PTR_T + +#if defined (__STDC__) +# define PTR_T void * +#else +# define PTR_T char * +#endif + +#endif /* PTR_T */ + +extern PTR_T malloc (); +extern PTR_T realloc (); +extern void free (); + +/* Other miscellaneous functions. */ +extern void abort (); +extern void exit (); +extern char *getenv (); +extern void qsort (); -// -///* String conversion functions. */ -//extern int atoi (); -// -//extern double atof (); -//extern double strtod (); -// -///* Memory allocation functions. */ -///* Generic pointer type. */ -//#ifndef PTR_T -// -//#if defined (__STDC__) -//# define PTR_T void * -//#else -//# define PTR_T char * -//#endif -// -//#endif /* PTR_T */ -// -//extern PTR_T malloc (); -//extern PTR_T realloc (); -//extern void free (); -// -///* Other miscellaneous functions. */ -//extern void abort (); -//extern void exit (); -//extern char *getenv (); -//extern void qsort (); -// #endif /* _STDLIB_H */ diff -urN readline-32-src/bind.c readline-src/bind.c --- readline-32-src/bind.c 2008-04-17 12:47:47.203125000 -0700 +++ readline-src/bind.c 2005-03-07 18:52:58.000000000 -0800 @@ -1368,123 +1368,43 @@ #define V_SPECIAL 0x1 -//************************* CHANGED ******************************************************* -//*************************C2099: intializer is not a constant***************************** -//static struct { -// const char *name; -// int *value; -// int flags; -//} boolean_varlist [] = { -// { "blink-matching-paren", &rl_blink_matching_paren, V_SPECIAL }, // -// { "byte-oriented", &rl_byte_oriented, 0 }, -// { "completion-ignore-case", &_rl_completion_case_fold, 0 }, -// { "convert-meta", &_rl_convert_meta_chars_to_ascii, 0 }, -// { "disable-completion", &rl_inhibit_completion, 0 }, -// { "enable-keypad", &_rl_enable_keypad, 0 }, -// { "expand-tilde", &rl_complete_with_tilde_expansion, 0 }, -// { "history-preserve-point", &_rl_history_preserve_point, 0 }, -// { "horizontal-scroll-mode", &_rl_horizontal_scroll_mode, 0 }, -// { "input-meta", &_rl_meta_flag, 0 }, -// { "mark-directories", &_rl_complete_mark_directories, 0 }, -// { "mark-modified-lines", &_rl_mark_modified_lines, 0 }, -// { "mark-symlinked-directories", &_rl_complete_mark_symlink_dirs, 0 }, -// { "match-hidden-files", &_rl_match_hidden_files, 0 }, -// { "meta-flag", &_rl_meta_flag, 0 }, -// { "output-meta", &_rl_output_meta_chars, 0 }, -// { "page-completions", &_rl_page_completions, 0 }, -// { "prefer-visible-bell", &_rl_prefer_visible_bell, V_SPECIAL }, -// { "print-completions-horizontally", &_rl_print_completions_horizontally, 0 }, -// { "show-all-if-ambiguous", &_rl_complete_show_all, 0 }, -// { "show-all-if-unmodified", &_rl_complete_show_unmodified, 0 }, -//#if defined (VISIBLE_STATS) -// { "visible-stats", &rl_visible_stats, 0 }, -//#endif /* VISIBLE_STATS */ -// { (char *)NULL, (int *)NULL } -//}; - -typedef struct { +static struct { const char *name; int *value; int flags; -} aStruct; - +} boolean_varlist [] = { + { "blink-matching-paren", &rl_blink_matching_paren, V_SPECIAL }, + { "byte-oriented", &rl_byte_oriented, 0 }, + { "completion-ignore-case", &_rl_completion_case_fold, 0 }, + { "convert-meta", &_rl_convert_meta_chars_to_ascii, 0 }, + { "disable-completion", &rl_inhibit_completion, 0 }, + { "enable-keypad", &_rl_enable_keypad, 0 }, + { "expand-tilde", &rl_complete_with_tilde_expansion, 0 }, + { "history-preserve-point", &_rl_history_preserve_point, 0 }, + { "horizontal-scroll-mode", &_rl_horizontal_scroll_mode, 0 }, + { "input-meta", &_rl_meta_flag, 0 }, + { "mark-directories", &_rl_complete_mark_directories, 0 }, + { "mark-modified-lines", &_rl_mark_modified_lines, 0 }, + { "mark-symlinked-directories", &_rl_complete_mark_symlink_dirs, 0 }, + { "match-hidden-files", &_rl_match_hidden_files, 0 }, + { "meta-flag", &_rl_meta_flag, 0 }, + { "output-meta", &_rl_output_meta_chars, 0 }, + { "page-completions", &_rl_page_completions, 0 }, + { "prefer-visible-bell", &_rl_prefer_visible_bell, V_SPECIAL }, + { "print-completions-horizontally", &_rl_print_completions_horizontally, 0 }, + { "show-all-if-ambiguous", &_rl_complete_show_all, 0 }, + { "show-all-if-unmodified", &_rl_complete_show_unmodified, 0 }, #if defined (VISIBLE_STATS) - aStruct boolean_varlist[23]; -#else - aStruct boolean_varlist[22]; + { "visible-stats", &rl_visible_stats, 0 }, #endif /* VISIBLE_STATS */ + { (char *)NULL, (int *)NULL } +}; -void -init_boolean_varlist() -{ - register int i; - - boolean_varlist[0].name = "blink-matching-paren"; - boolean_varlist[0].value = &rl_blink_matching_paren; - boolean_varlist[1].name = "byte-oriented"; - boolean_varlist[1].value = &rl_byte_oriented; - boolean_varlist[2].name = "completion-ignore-case"; - boolean_varlist[2].value = &_rl_completion_case_fold; - boolean_varlist[3].name = "convert-meta"; - boolean_varlist[3].value = &_rl_convert_meta_chars_to_ascii; - boolean_varlist[4].name = "disable-completion"; - boolean_varlist[4].value = &rl_inhibit_completion; - boolean_varlist[5].name = "enable-keypad"; - boolean_varlist[5].value = &_rl_enable_keypad; - boolean_varlist[6].name = "expand-tilde"; - boolean_varlist[6].value = &rl_complete_with_tilde_expansion; - boolean_varlist[7].name = "history-preserve-point"; - boolean_varlist[7].value = &_rl_history_preserve_point; - boolean_varlist[8].name = "horizontal-scroll-mode"; - boolean_varlist[8].value = &_rl_horizontal_scroll_mode; - boolean_varlist[9].name = "input-meta"; - boolean_varlist[9].value = &_rl_meta_flag; - boolean_varlist[10].name = "mark-directories"; - boolean_varlist[10].value = &_rl_complete_mark_directories; - boolean_varlist[11].name = "mark-modified-lines"; - boolean_varlist[11].value = &_rl_mark_modified_lines; - boolean_varlist[12].name = "mark-symlinked-directories"; - boolean_varlist[12].value = &_rl_complete_mark_symlink_dirs; - boolean_varlist[13].name = "match-hidden-files"; - boolean_varlist[13].value = &_rl_match_hidden_files; - boolean_varlist[14].name = "meta-flag"; - boolean_varlist[14].value = &_rl_meta_flag; - boolean_varlist[15].name = "output-meta"; - boolean_varlist[15].value = &_rl_output_meta_chars; - boolean_varlist[16].name = "page-completions"; - boolean_varlist[16].value = &_rl_page_completions; - boolean_varlist[17].name = "prefer-visible-bell"; - boolean_varlist[17].value = &_rl_prefer_visible_bell; - boolean_varlist[18].name = "print-completions-horizontally"; - boolean_varlist[18].value = &_rl_print_completions_horizontally; - boolean_varlist[19].name = "show-all-if-ambiguous"; - boolean_varlist[19].value = &_rl_complete_show_all; - boolean_varlist[20].name = "show-all-if-unmodified"; - boolean_varlist[20].value = &_rl_complete_show_unmodified; - - #if defined (VISIBLE_STATS) - boolean_varlist[21].name = (char *)NULL; - boolean_varlist[21].value = (int *)NULL; - #else - boolean_varlist[21].name = "visible-stats"; - boolean_varlist[21].value = &rl_visible_stats; - boolean_varlist[22].name = (char *)NULL; - boolean_varlist[22].value = (int *)NULL; - #endif /* VISIBLE_STATS */ - - for (i = 0; boolean_varlist[i].name; i++) - boolean_varlist[i].flags = 0; - - boolean_varlist[0].flags = V_SPECIAL; - boolean_varlist[17].flags = V_SPECIAL; -} - static int find_boolean_var (name) const char *name; { register int i; - init_boolean_varlist(); for (i = 0; boolean_varlist[i].name; i++) if (_rl_stricmp (name, boolean_varlist[i].name) == 0) @@ -1500,8 +1420,7 @@ int i; { const char *name; - - init_boolean_varlist(); + name = boolean_varlist[i].name; if (_rl_stricmp (name, "blink-matching-paren") == 0) @@ -1581,8 +1500,6 @@ register int i; int v; - init_boolean_varlist(); - /* Check for simple variables first. */ i = find_boolean_var (name); if (i >= 0) @@ -2225,7 +2142,6 @@ int i; const char *kname; - init_boolean_varlist(); for (i = 0; boolean_varlist[i].name; i++) { if (print_readably) diff -urN readline-32-src/complete.c readline-src/complete.c --- readline-32-src/complete.c 2008-04-15 15:32:42.046875000 -0700 +++ readline-src/complete.c 2005-03-07 18:52:58.000000000 -0800 @@ -1891,8 +1891,7 @@ #else /* _WIN32 */ if (GetUserName (user_name, &user_len)) { - //******************CHANGED************** used to be name_len - if (namelen == 0 || (!strnicmp (username, user_name, namelen))) + if (namelen == 0 || (!strnicmp (username, user_name, name_len))) { value = (char *)xmalloc (2 + strlen (user_name)); *value = *text; diff -urN readline-32-src/histlib.h readline-src/histlib.h --- readline-32-src/histlib.h 2008-04-15 13:14:20.921875000 -0700 +++ readline-src/histlib.h 2002-03-12 17:26:32.000000000 -0700 @@ -22,17 +22,11 @@ #if !defined (_HISTLIB_H_) #define _HISTLIB_H_ -//#if defined (HAVE_STRING_H) -//# include -//#else -//# include -//#endif /* !HAVE_STRING_H */ #if defined (HAVE_STRING_H) # include -#endif -#if defined (HAVE_STRINGS_H) +#else # include -#endif +#endif /* !HAVE_STRING_H */ #if !defined (STREQ) #define STREQ(a, b) (((a)[0] == (b)[0]) && (strcmp ((a), (b)) == 0)) diff -urN readline-32-src/keymaps.c readline-src/keymaps.c --- readline-32-src/keymaps.c 2008-04-15 17:12:54.312500000 -0700 +++ readline-src/keymaps.c 2002-10-07 19:25:52.000000000 -0700 @@ -35,8 +35,7 @@ #include "readline.h" #include "rlconf.h" -//*******************CHANGED COMMENTED BELOW**************************** -//#include "emacs_keymap.c" +#include "emacs_keymap.c" #if defined (VI_MODE) #include "vi_keymap.c" diff -urN readline-32-src/keymaps.h readline-src/keymaps.h --- readline-32-src/keymaps.h 2008-04-16 13:40:33.328125000 -0700 +++ readline-src/keymaps.h 2001-11-20 17:42:50.000000000 -0800 @@ -67,8 +67,7 @@ #define ISMACR 2 extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap, emacs_meta_keymap, emacs_ctlx_keymap; -//**************************CHANGED extern to static**************************** -static KEYMAP_ENTRY_ARRAY vi_insertion_keymap, vi_movement_keymap; +extern KEYMAP_ENTRY_ARRAY vi_insertion_keymap, vi_movement_keymap; /* Return a new, empty keymap. Free it with free() when you are done. */ diff -urN readline-32-src/parens.c readline-src/parens.c --- readline-32-src/parens.c 2008-04-15 15:46:22.406250000 -0700 +++ readline-src/parens.c 2005-03-07 18:52:58.000000000 -0800 @@ -53,19 +53,11 @@ # include #endif -//***********************CHANGED**************************** -//#if defined (HAVE_STRING_H) -//# include -//#else /* !HAVE_STRING_H */ -//# include -//#endif /* !HAVE_STRING_H */ - #if defined (HAVE_STRING_H) # include -#endif -#if defined (HAVE_STRINGS_H) +#else /* !HAVE_STRING_H */ # include -#endif +#endif /* !HAVE_STRING_H */ #if !defined (strchr) && !defined (__STDC__) extern char *strchr (), *strrchr (); diff -urN readline-32-src/readline.h readline-src/readline.h --- readline-32-src/readline.h 2008-04-17 12:46:08.906250000 -0700 +++ readline-src/readline.h 2005-03-07 19:51:18.000000000 -0800 @@ -51,8 +51,6 @@ # define READLINE_DLL_IMPEXP #endif -#define READLINE_LIBRARY - #if defined (READLINE_LIBRARY) # include "rlstdc.h" # include "rltypedefs.h" @@ -354,20 +352,17 @@ READLINE_DLL_IMPEXP int rl_read_init_file PARAMS((const char *)); READLINE_DLL_IMPEXP int rl_parse_and_bind PARAMS((char *)); -//***********************CHANGED commented below**************************** -//These decleartions already exsist in keymaps.h as extern. /* Functions for manipulating keymaps. */ -//READLINE_DLL_IMPEXP Keymap rl_make_bare_keymap PARAMS((void)); -//READLINE_DLL_IMPEXP Keymap rl_copy_keymap PARAMS((Keymap)); -//READLINE_DLL_IMPEXP Keymap rl_make_keymap PARAMS((void)); -//READLINE_DLL_IMPEXP void rl_discard_keymap PARAMS((Keymap)); -// -//READLINE_DLL_IMPEXP Keymap rl_get_keymap_by_name PARAMS((const char *)); -//READLINE_DLL_IMPEXP char *rl_get_keymap_name PARAMS((Keymap)); -//READLINE_DLL_IMPEXP void rl_set_keymap PARAMS((Keymap)); -//READLINE_DLL_IMPEXP Keymap rl_get_keymap PARAMS((void)); - -///* Undocumented; used internally only. */ +READLINE_DLL_IMPEXP Keymap rl_make_bare_keymap PARAMS((void)); +READLINE_DLL_IMPEXP Keymap rl_copy_keymap PARAMS((Keymap)); +READLINE_DLL_IMPEXP Keymap rl_make_keymap PARAMS((void)); +READLINE_DLL_IMPEXP void rl_discard_keymap PARAMS((Keymap)); + +READLINE_DLL_IMPEXP Keymap rl_get_keymap_by_name PARAMS((const char *)); +READLINE_DLL_IMPEXP char *rl_get_keymap_name PARAMS((Keymap)); +READLINE_DLL_IMPEXP void rl_set_keymap PARAMS((Keymap)); +READLINE_DLL_IMPEXP Keymap rl_get_keymap PARAMS((void)); +/* Undocumented; used internally only. */ READLINE_DLL_IMPEXP void rl_set_keymap_from_edit_mode PARAMS((void)); READLINE_DLL_IMPEXP char *rl_get_keymap_name_from_edit_mode PARAMS((void)); diff -urN readline-32-src/rldefs.h readline-src/rldefs.h --- readline-32-src/rldefs.h 2008-04-15 15:46:19.406250000 -0700 +++ readline-src/rldefs.h 2005-03-07 19:52:08.000000000 -0800 @@ -50,18 +50,16 @@ /* Decide which flavor of the header file describing the C library string functions to include and include it. */ -//**************CHANGED***************** + #if defined (HAVE_STRING_H) # include -#endif -#if defined (HAVE_STRINGS_H) +#else /* !HAVE_STRING_H */ # include -#endif +#endif /* !HAVE_STRING_H */ -//**************CHANGED***************** -//#if !defined (strchr) && !defined (__STDC__) -//extern char *strchr (), *strrchr (); -//#endif /* !strchr && !__STDC__ */ +#if !defined (strchr) && !defined (__STDC__) +extern char *strchr (), *strrchr (); +#endif /* !strchr && !__STDC__ */ #if defined (PREFER_STDARG) # include diff -urN readline-32-src/savestring.c readline-src/savestring.c --- readline-32-src/savestring.c 2008-04-15 15:42:56.437500000 -0700 +++ readline-src/savestring.c 2003-12-09 21:06:02.000000000 -0800 @@ -21,8 +21,7 @@ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY -//*****************CHANGED commented out below************************ -//#include +#include #ifdef HAVE_STRING_H # include #endif diff -urN readline-32-src/shell.c readline-src/shell.c --- readline-32-src/shell.c 2008-04-15 15:46:22.796875000 -0700 +++ readline-src/shell.c 2005-03-07 18:52:58.000000000 -0800 @@ -39,19 +39,11 @@ # include "ansi_stdlib.h" #endif /* HAVE_STDLIB_H */ -//***********************CHANGED**************************** -//#if defined (HAVE_STRING_H) -//# include -//#else -//# include -//#endif /* !HAVE_STRING_H */ - #if defined (HAVE_STRING_H) # include -#endif -#if defined (HAVE_STRINGS_H) +#else # include -#endif +#endif /* !HAVE_STRING_H */ #if defined (HAVE_LIMITS_H) # include diff -urN readline-32-src/tilde.c readline-src/tilde.c --- readline-32-src/tilde.c 2008-04-15 15:46:23.203125000 -0700 +++ readline-src/tilde.c 2005-03-07 18:52:58.000000000 -0800 @@ -30,19 +30,11 @@ # include #endif -//***********************CHANGED**************************** -//#if defined (HAVE_STRING_H) -//# include -//#else /* !HAVE_STRING_H */ -//# include -//#endif /* !HAVE_STRING_H */ - #if defined (HAVE_STRING_H) # include -#endif -#if defined (HAVE_STRINGS_H) +#else /* !HAVE_STRING_H */ # include -#endif +#endif /* !HAVE_STRING_H */ #if defined (HAVE_STDLIB_H) # include diff -urN readline-32-src/tilde.h readline-src/tilde.h --- readline-32-src/tilde.h 2008-04-15 15:43:57.390625000 -0700 +++ readline-src/tilde.h 2005-03-07 19:58:26.000000000 -0800 @@ -24,9 +24,6 @@ #if !defined (_TILDE_H_) # define _TILDE_H_ -//**************************CHANGED add define below********************** -#define READLINE_LIBRARY - #if defined READLINE_LIBRARY # include "rlstdc.h" #else diff -urN readline-32-src/vi_keymap.c readline-src/vi_keymap.c --- readline-32-src/vi_keymap.c 2008-04-17 13:44:16.843750000 -0700 +++ readline-src/vi_keymap.c 2001-11-29 17:05:36.000000000 -0800 @@ -310,6 +310,7 @@ #endif /* KEYMAP_SIZE > 128 */ }; + KEYMAP_ENTRY_ARRAY vi_insertion_keymap = { /* The regular control keys come first. */ { ISFUNC, (rl_command_func_t *)0x0 }, /* Control-@ */