[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-readline] [PATCH] Stop exposing undocumentated _rl_* symbols from l
|
From: |
Дилян Палаузов |
|
Subject: |
[Bug-readline] [PATCH] Stop exposing undocumentated _rl_* symbols from libreadline.so |
|
Date: |
Sun, 19 Jul 2015 10:36:06 +0000 |
-- check if the compiler supports __attribute__((visibility("hidden")))
-- #define HIDDEN accordingly
-- annotate all undocumentated, exported _rl_* symbols with HIDDEN
-- do the same for xfree, xmallor, xrealloc
This will allow the compiler to do furhter (link-time) optimizations and the
library will load faster, as it has shorter .dynsym section.
There might be other symbols eligible for hiding.
$ readelf -I libreadline.so.7 shows
BEFORE:
Histogram for `.gnu.hash' bucket list length (total of 1016 buckets):
Length Number % of total Coverage
0 512 ( 50.4%)
1 357 ( 35.1%) 53.1%
2 130 ( 12.8%) 91.8%
3 13 ( 1.3%) 97.6%
4 4 ( 0.4%) 100.0%
AFTER:
Histogram for `.gnu.hash' bucket list length (total of 877 buckets):
Length Number % of total Coverage
0 514 ( 58.6%)
1 290 ( 33.1%) 65.5%
2 66 ( 7.5%) 95.3%
3 7 ( 0.8%) 100.0%
---
colors.h | 14 +-
config.h.in | 10 ++
configure.ac | 48 +++++++
display.c | 4 +-
misc.c | 6 +-
parse-colors.h | 2 +-
readline.c | 2 +-
rlmbutil.h | 20 +--
rlprivate.h | 418 ++++++++++++++++++++++++++++-----------------------------
terminal.c | 8 +-
util.c | 2 +-
xmalloc.h | 6 +-
12 files changed, 299 insertions(+), 241 deletions(-)
diff --git a/colors.h b/colors.h
index 8627bd4..8440297 100644
--- a/colors.h
+++ b/colors.h
@@ -62,7 +62,7 @@ struct bin_str
/* file type indicators (dir, sock, fifo, ...)
Default value is initialized in parse-colors.c.
It is then modified from the values of $LS_COLORS. */
-extern struct bin_str _rl_color_indicator[];
+HIDDEN extern struct bin_str _rl_color_indicator[];
/* The LS_COLORS variable is in a termcap-like format. */
typedef struct _color_ext_type
@@ -74,7 +74,7 @@ typedef struct _color_ext_type
/* file extensions indicators (.txt, .log, .jpg, ...)
Values are taken from $LS_COLORS in rl_parse_colors(). */
-extern COLOR_EXT_TYPE *_rl_color_ext_list;
+HIDDEN extern COLOR_EXT_TYPE *_rl_color_ext_list;
#define FILETYPE_INDICATORS \
{ \
@@ -117,10 +117,10 @@ enum filetype
/* Prefix color, currently same as directory */
#define C_PREFIX C_DIR
-extern void _rl_put_indicator (const struct bin_str *ind);
-extern void _rl_set_normal_color (void);
-extern bool _rl_print_prefix_color (void);
-extern bool _rl_print_color_indicator (char *f);
-extern void _rl_prep_non_filename_text (void);
+HIDDEN extern void _rl_put_indicator (const struct bin_str *ind);
+HIDDEN extern void _rl_set_normal_color (void);
+HIDDEN extern bool _rl_print_prefix_color (void);
+HIDDEN extern bool _rl_print_color_indicator (char *f);
+HIDDEN extern void _rl_prep_non_filename_text (void);
#endif /* !_COLORS_H_ */
diff --git a/config.h.in b/config.h.in
index e5658c2..cad75d0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -294,3 +294,13 @@
#endif
/* VARARGS defines moved to rlstdc.h */
+
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+ declarations. */
+#undef HAVE_VISIBILITY
+
+#if HAVE_VISIBILITY
+# define HIDDEN __attribute__((__visibility__("hidden")))
+#else
+# define HIDDEN
+#endif
diff --git a/configure.ac b/configure.ac
index 42e21fa..51cf3b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,6 +266,54 @@ fi
if test "$opt_shared_libs" = "yes"; then
SHARED_TARGET=shared
SHARED_INSTALL_TARGET=install-shared
+ dnl code below is copied from gnulib/visibility.m4
+ HAVE_VISIBILITY=0
+ if test -n "$GCC"; then
+ dnl First, check whether -Werror can be added to the command
line, or
+ dnl whether it leads to an error because of some other option
that the
+ dnl user has put into $CC $CFLAGS $CPPFLAGS.
+ AC_MSG_CHECKING([whether the -Werror option is usable])
+ AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[]], [[]])],
+ [gl_cv_cc_vis_werror=yes],
+ [gl_cv_cc_vis_werror=no])
+ CFLAGS="$gl_save_CFLAGS"])
+ AC_MSG_RESULT([$gl_cv_cc_vis_werror])
+ dnl Now check whether visibility declarations are supported.
+ AC_MSG_CHECKING([for simple visibility declarations])
+ AC_CACHE_VAL([gl_cv_cc_visibility], [
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ dnl We use the option -Werror and a function dummyfunc,
because on some
+ dnl platforms (Cygwin 1.7) the use of -fvisibility
triggers a warning
+ dnl "visibility attribute not supported in this
configuration; ignored"
+ dnl at the first function definition in every
compilation unit, and we
+ dnl don't want to use the option in this case.
+ if test $gl_cv_cc_vis_werror = yes; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[extern
__attribute__((__visibility__("hidden"))) int hiddenvar;
+ extern
__attribute__((__visibility__("default"))) int exportedvar;
+ extern
__attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+ extern
__attribute__((__visibility__("default"))) int exportedfunc (void);
+ void dummyfunc (void) {}
+ ]],
+ [[]])],
+ [gl_cv_cc_visibility=yes],
+ [gl_cv_cc_visibility=no])
+ CFLAGS="$gl_save_CFLAGS"])
+ AC_MSG_RESULT([$gl_cv_cc_visibility])
+ if test $gl_cv_cc_visibility = yes; then
+ HAVE_VISIBILITY=1
+ fi
+ fi
+ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+ [Define to 1 or 0, depending whether the compiler supports
simple visibility declarations.])
fi
AC_SUBST(STATIC_TARGET)
diff --git a/display.c b/display.c
index c6b14fb..2c2f8ca 100644
--- a/display.c
+++ b/display.c
@@ -182,7 +182,7 @@ int _rl_vi_cmd_modestr_len;
in such a locale. This is an artifact of the donated multibyte support.
Care must be taken when modifying its value. */
int _rl_last_c_pos = 0;
-int _rl_last_v_pos = 0;
+HIDDEN int _rl_last_v_pos = 0;
static int cpos_adjusted;
static int cpos_buffer_position;
@@ -2763,7 +2763,7 @@ _rl_erase_entire_line ()
fflush (rl_outstream);
}
-void
+HIDDEN void
_rl_ttyflush ()
{
fflush (rl_outstream);
diff --git a/misc.c b/misc.c
index a890cda..6b0eba2 100644
--- a/misc.c
+++ b/misc.c
@@ -117,7 +117,7 @@ _rl_arg_getchar ()
/* Process C as part of the current numeric argument. Return -1 if the
argument should be aborted, 0 if we should not read any more chars, and
1 if we should continue to read chars. */
-int
+HIDDEN int
_rl_arg_dispatch (cxt, c)
_rl_arg_cxt cxt;
int c;
@@ -306,7 +306,7 @@ rl_discard_argument ()
/* While we are editing the history, this is the saved
version of the original line. */
-HIST_ENTRY *_rl_saved_line_for_history = (HIST_ENTRY *)NULL;
+HIDDEN HIST_ENTRY *_rl_saved_line_for_history = (HIST_ENTRY *)NULL;
/* Set the history pointer back to the last entry in the history. */
void
@@ -320,7 +320,7 @@ _rl_start_using_history ()
}
/* Free the contents (and containing structure) of a HIST_ENTRY. */
-void
+HIDDEN void
_rl_free_history_entry (entry)
HIST_ENTRY *entry;
{
diff --git a/parse-colors.h b/parse-colors.h
index aef86f7..3f5f888 100644
--- a/parse-colors.h
+++ b/parse-colors.h
@@ -31,7 +31,7 @@
#define LEN_STR_PAIR(s) sizeof (s) - 1, s
-void _rl_parse_colors (void);
+HIDDEN void _rl_parse_colors (void);
static const char *const indicator_name[]=
{
diff --git a/readline.c b/readline.c
index 1463308..0be2f1f 100644
--- a/readline.c
+++ b/readline.c
@@ -235,7 +235,7 @@ char *_rl_comment_begin;
Keymap rl_executing_keymap;
/* Keymap we're currently using to dispatch. */
-Keymap _rl_dispatching_keymap;
+HIDDEN Keymap _rl_dispatching_keymap;
/* Non-zero means to erase entire line, including prompt, on empty input
lines. */
int rl_erase_empty_line = 0;
diff --git a/rlmbutil.h b/rlmbutil.h
index f0ecfb4..5538d90 100644
--- a/rlmbutil.h
+++ b/rlmbutil.h
@@ -91,22 +91,22 @@
#define MB_FIND_ANY 0x00
#define MB_FIND_NONZERO 0x01
-extern int _rl_find_prev_mbchar PARAMS((char *, int, int));
-extern int _rl_find_next_mbchar PARAMS((char *, int, int, int));
+HIDDEN extern int _rl_find_prev_mbchar PARAMS((char *, int, int));
+HIDDEN extern int _rl_find_next_mbchar PARAMS((char *, int, int, int));
#ifdef HANDLE_MULTIBYTE
-extern int _rl_compare_chars PARAMS((char *, int, mbstate_t *, char *, int,
mbstate_t *));
-extern int _rl_get_char_len PARAMS((char *, mbstate_t *));
-extern int _rl_adjust_point PARAMS((char *, int, mbstate_t *));
+HIDDEN extern int _rl_compare_chars PARAMS((char *, int, mbstate_t *, char *,
int, mbstate_t *));
+HIDDEN extern int _rl_get_char_len PARAMS((char *, mbstate_t *));
+HIDDEN extern int _rl_adjust_point PARAMS((char *, int, mbstate_t *));
-extern int _rl_read_mbchar PARAMS((char *, int));
-extern int _rl_read_mbstring PARAMS((int, char *, int));
+HIDDEN extern int _rl_read_mbchar PARAMS((char *, int));
+HIDDEN extern int _rl_read_mbstring PARAMS((int, char *, int));
-extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int));
+HIDDEN extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *,
int));
-extern wchar_t _rl_char_value PARAMS((char *, int));
-extern int _rl_walphabetic PARAMS((wchar_t));
+HIDDEN extern wchar_t _rl_char_value PARAMS((char *, int));
+HIDDEN extern int _rl_walphabetic PARAMS((wchar_t));
#define _rl_to_wupper(wc) (iswlower (wc) ? towupper (wc) : (wc))
#define _rl_to_wlower(wc) (iswupper (wc) ? towlower (wc) : (wc))
diff --git a/rlprivate.h b/rlprivate.h
index 9b859f9..96525e7 100644
--- a/rlprivate.h
+++ b/rlprivate.h
@@ -185,8 +185,8 @@ extern int rl_complete_with_tilde_expansion;
extern int rl_visible_stats;
#endif /* VISIBLE_STATS */
#if defined (COLOR_SUPPORT)
-extern int _rl_colored_stats;
-extern int _rl_colored_completion_prefix;
+HIDDEN extern int _rl_colored_stats;
+HIDDEN extern int _rl_colored_completion_prefix;
#endif
/* readline.c */
@@ -211,13 +211,13 @@ extern int rl_blink_matching_paren;
extern int rl_set_retained_kills PARAMS((int));
/* terminal.c */
-extern void _rl_set_screen_size PARAMS((int, int));
+HIDDEN extern void _rl_set_screen_size PARAMS((int, int));
/* undo.c */
-extern int _rl_fix_last_undo_of_type PARAMS((int, int, int));
+HIDDEN extern int _rl_fix_last_undo_of_type PARAMS((int, int, int));
/* util.c */
-extern char *_rl_savestring PARAMS((const char *));
+HIDDEN extern char *_rl_savestring PARAMS((const char *));
/*************************************************************************
* *
@@ -241,60 +241,60 @@ extern void readline_internal_setup PARAMS((void));
extern char *readline_internal_teardown PARAMS((int));
extern int readline_internal_char PARAMS((void));
-extern _rl_keyseq_cxt *_rl_keyseq_cxt_alloc PARAMS((void));
-extern void _rl_keyseq_cxt_dispose PARAMS((_rl_keyseq_cxt *));
-extern void _rl_keyseq_chain_dispose PARAMS((void));
+HIDDEN extern _rl_keyseq_cxt *_rl_keyseq_cxt_alloc PARAMS((void));
+HIDDEN extern void _rl_keyseq_cxt_dispose PARAMS((_rl_keyseq_cxt *));
+HIDDEN extern void _rl_keyseq_chain_dispose PARAMS((void));
-extern int _rl_dispatch_callback PARAMS((_rl_keyseq_cxt *));
+HIDDEN extern int _rl_dispatch_callback PARAMS((_rl_keyseq_cxt *));
/* callback.c */
-extern _rl_callback_generic_arg *_rl_callback_data_alloc PARAMS((int));
-extern void _rl_callback_data_dispose PARAMS((_rl_callback_generic_arg *));
+HIDDEN extern _rl_callback_generic_arg *_rl_callback_data_alloc PARAMS((int));
+HIDDEN extern void _rl_callback_data_dispose PARAMS((_rl_callback_generic_arg
*));
#endif /* READLINE_CALLBACKS */
/* bind.c */
-extern char *_rl_untranslate_macro_value PARAMS((char *, int));
+HIDDEN extern char *_rl_untranslate_macro_value PARAMS((char *, int));
/* complete.c */
-extern void _rl_reset_completion_state PARAMS((void));
-extern char _rl_find_completion_word PARAMS((int *, int *));
-extern void _rl_free_match_list PARAMS((char **));
+HIDDEN extern void _rl_reset_completion_state PARAMS((void));
+HIDDEN extern char _rl_find_completion_word PARAMS((int *, int *));
+HIDDEN extern void _rl_free_match_list PARAMS((char **));
/* display.c */
-extern char *_rl_strip_prompt PARAMS((char *));
-extern void _rl_reset_prompt PARAMS((void));
-extern void _rl_move_cursor_relative PARAMS((int, const char *));
-extern void _rl_move_vert PARAMS((int));
-extern void _rl_save_prompt PARAMS((void));
-extern void _rl_restore_prompt PARAMS((void));
-extern char *_rl_make_prompt_for_search PARAMS((int));
-extern void _rl_erase_at_end_of_line PARAMS((int));
-extern void _rl_clear_to_eol PARAMS((int));
-extern void _rl_clear_screen PARAMS((void));
-extern void _rl_update_final PARAMS((void));
-extern void _rl_redisplay_after_sigwinch PARAMS((void));
-extern void _rl_clean_up_for_exit PARAMS((void));
-extern void _rl_erase_entire_line PARAMS((void));
-extern int _rl_current_display_line PARAMS((void));
+HIDDEN extern char *_rl_strip_prompt PARAMS((char *));
+HIDDEN extern void _rl_reset_prompt PARAMS((void));
+HIDDEN extern void _rl_move_cursor_relative PARAMS((int, const char *));
+HIDDEN extern void _rl_move_vert PARAMS((int));
+HIDDEN extern void _rl_save_prompt PARAMS((void));
+HIDDEN extern void _rl_restore_prompt PARAMS((void));
+HIDDEN extern char *_rl_make_prompt_for_search PARAMS((int));
+HIDDEN extern void _rl_erase_at_end_of_line PARAMS((int));
+HIDDEN extern void _rl_clear_to_eol PARAMS((int));
+HIDDEN extern void _rl_clear_screen PARAMS((void));
+HIDDEN extern void _rl_update_final PARAMS((void));
+HIDDEN extern void _rl_redisplay_after_sigwinch PARAMS((void));
+HIDDEN extern void _rl_clean_up_for_exit PARAMS((void));
+HIDDEN extern void _rl_erase_entire_line PARAMS((void));
+HIDDEN extern int _rl_current_display_line PARAMS((void));
/* input.c */
-extern int _rl_any_typein PARAMS((void));
-extern int _rl_input_available PARAMS((void));
-extern int _rl_input_queued PARAMS((int));
-extern void _rl_insert_typein PARAMS((int));
-extern int _rl_unget_char PARAMS((int));
-extern int _rl_pushed_input_available PARAMS((void));
+HIDDEN extern int _rl_any_typein PARAMS((void));
+HIDDEN extern int _rl_input_available PARAMS((void));
+HIDDEN extern int _rl_input_queued PARAMS((int));
+HIDDEN extern void _rl_insert_typein PARAMS((int));
+HIDDEN extern int _rl_unget_char PARAMS((int));
+HIDDEN extern int _rl_pushed_input_available PARAMS((void));
/* isearch.c */
-extern _rl_search_cxt *_rl_scxt_alloc PARAMS((int, int));
-extern void _rl_scxt_dispose PARAMS((_rl_search_cxt *, int));
+HIDDEN extern _rl_search_cxt *_rl_scxt_alloc PARAMS((int, int));
+HIDDEN extern void _rl_scxt_dispose PARAMS((_rl_search_cxt *, int));
-extern int _rl_isearch_dispatch PARAMS((_rl_search_cxt *, int));
-extern int _rl_isearch_callback PARAMS((_rl_search_cxt *));
-extern int _rl_isearch_cleanup PARAMS((_rl_search_cxt *, int));
+HIDDEN extern int _rl_isearch_dispatch PARAMS((_rl_search_cxt *, int));
+HIDDEN extern int _rl_isearch_callback PARAMS((_rl_search_cxt *));
+HIDDEN extern int _rl_isearch_cleanup PARAMS((_rl_search_cxt *, int));
-extern int _rl_search_getchar PARAMS((_rl_search_cxt *));
+HIDDEN extern int _rl_search_getchar PARAMS((_rl_search_cxt *));
/* kill.c */
#define BRACK_PASTE_PREF "\033[200~"
@@ -307,255 +307,255 @@ extern int _rl_search_getchar PARAMS((_rl_search_cxt
*));
#define BRACK_PASTE_FINI "\033[?2004l"
/* macro.c */
-extern void _rl_with_macro_input PARAMS((char *));
-extern int _rl_next_macro_key PARAMS((void));
-extern int _rl_prev_macro_key PARAMS((void));
-extern void _rl_push_executing_macro PARAMS((void));
-extern void _rl_pop_executing_macro PARAMS((void));
-extern void _rl_add_macro_char PARAMS((int));
-extern void _rl_kill_kbd_macro PARAMS((void));
+HIDDEN extern void _rl_with_macro_input PARAMS((char *));
+HIDDEN extern int _rl_next_macro_key PARAMS((void));
+HIDDEN extern int _rl_prev_macro_key PARAMS((void));
+HIDDEN extern void _rl_push_executing_macro PARAMS((void));
+HIDDEN extern void _rl_pop_executing_macro PARAMS((void));
+HIDDEN extern void _rl_add_macro_char PARAMS((int));
+HIDDEN extern void _rl_kill_kbd_macro PARAMS((void));
/* misc.c */
-extern int _rl_arg_overflow PARAMS((void));
-extern void _rl_arg_init PARAMS((void));
-extern int _rl_arg_getchar PARAMS((void));
-extern int _rl_arg_callback PARAMS((_rl_arg_cxt));
-extern void _rl_reset_argument PARAMS((void));
+HIDDEN extern int _rl_arg_overflow PARAMS((void));
+HIDDEN extern void _rl_arg_init PARAMS((void));
+HIDDEN extern int _rl_arg_getchar PARAMS((void));
+HIDDEN extern int _rl_arg_callback PARAMS((_rl_arg_cxt));
+HIDDEN extern void _rl_reset_argument PARAMS((void));
-extern void _rl_start_using_history PARAMS((void));
-extern int _rl_free_saved_history_line PARAMS((void));
-extern void _rl_set_insert_mode PARAMS((int, int));
+HIDDEN extern void _rl_start_using_history PARAMS((void));
+HIDDEN extern int _rl_free_saved_history_line PARAMS((void));
+HIDDEN extern void _rl_set_insert_mode PARAMS((int, int));
-extern void _rl_revert_all_lines PARAMS((void));
+HIDDEN extern void _rl_revert_all_lines PARAMS((void));
/* nls.c */
-extern int _rl_init_eightbit PARAMS((void));
+HIDDEN extern int _rl_init_eightbit PARAMS((void));
/* parens.c */
-extern void _rl_enable_paren_matching PARAMS((int));
+HIDDEN extern void _rl_enable_paren_matching PARAMS((int));
/* readline.c */
-extern void _rl_init_line_state PARAMS((void));
-extern void _rl_set_the_line PARAMS((void));
-extern int _rl_dispatch PARAMS((int, Keymap));
-extern int _rl_dispatch_subseq PARAMS((int, Keymap, int));
-extern void _rl_internal_char_cleanup PARAMS((void));
+HIDDEN extern void _rl_init_line_state PARAMS((void));
+HIDDEN extern void _rl_set_the_line PARAMS((void));
+HIDDEN extern int _rl_dispatch PARAMS((int, Keymap));
+HIDDEN extern int _rl_dispatch_subseq PARAMS((int, Keymap, int));
+HIDDEN extern void _rl_internal_char_cleanup PARAMS((void));
/* rltty.c */
-extern int _rl_disable_tty_signals PARAMS((void));
-extern int _rl_restore_tty_signals PARAMS((void));
+HIDDEN extern int _rl_disable_tty_signals PARAMS((void));
+HIDDEN extern int _rl_restore_tty_signals PARAMS((void));
/* search.c */
-extern int _rl_nsearch_callback PARAMS((_rl_search_cxt *));
-extern int _rl_nsearch_cleanup PARAMS((_rl_search_cxt *, int));
+HIDDEN extern int _rl_nsearch_callback PARAMS((_rl_search_cxt *));
+HIDDEN extern int _rl_nsearch_cleanup PARAMS((_rl_search_cxt *, int));
/* signals.c */
-extern void _rl_signal_handler PARAMS((int));
+HIDDEN extern void _rl_signal_handler PARAMS((int));
-extern void _rl_block_sigint PARAMS((void));
-extern void _rl_release_sigint PARAMS((void));
-extern void _rl_block_sigwinch PARAMS((void));
-extern void _rl_release_sigwinch PARAMS((void));
+HIDDEN extern void _rl_block_sigint PARAMS((void));
+HIDDEN extern void _rl_release_sigint PARAMS((void));
+HIDDEN extern void _rl_block_sigwinch PARAMS((void));
+HIDDEN extern void _rl_release_sigwinch PARAMS((void));
/* terminal.c */
-extern void _rl_get_screen_size PARAMS((int, int));
-extern void _rl_sigwinch_resize_terminal PARAMS((void));
-extern int _rl_init_terminal_io PARAMS((const char *));
+HIDDEN extern void _rl_get_screen_size PARAMS((int, int));
+HIDDEN extern void _rl_sigwinch_resize_terminal PARAMS((void));
+HIDDEN extern int _rl_init_terminal_io PARAMS((const char *));
#ifdef _MINIX
-extern void _rl_output_character_function PARAMS((int));
+HIDDEN extern void _rl_output_character_function PARAMS((int));
#else
-extern int _rl_output_character_function PARAMS((int));
+HIDDEN extern int _rl_output_character_function PARAMS((int));
#endif
-extern void _rl_output_some_chars PARAMS((const char *, int));
-extern int _rl_backspace PARAMS((int));
-extern void _rl_enable_meta_key PARAMS((void));
-extern void _rl_disable_meta_key PARAMS((void));
-extern void _rl_control_keypad PARAMS((int));
-extern void _rl_set_cursor PARAMS((int, int));
+HIDDEN extern void _rl_output_some_chars PARAMS((const char *, int));
+HIDDEN extern int _rl_backspace PARAMS((int));
+HIDDEN extern void _rl_enable_meta_key PARAMS((void));
+HIDDEN extern void _rl_disable_meta_key PARAMS((void));
+HIDDEN extern void _rl_control_keypad PARAMS((int));
+HIDDEN extern void _rl_set_cursor PARAMS((int, int));
/* text.c */
-extern void _rl_fix_point PARAMS((int));
-extern int _rl_replace_text PARAMS((const char *, int, int));
-extern int _rl_forward_char_internal PARAMS((int));
-extern int _rl_insert_char PARAMS((int, int));
-extern int _rl_overwrite_char PARAMS((int, int));
-extern int _rl_overwrite_rubout PARAMS((int, int));
-extern int _rl_rubout_char PARAMS((int, int));
+HIDDEN extern void _rl_fix_point PARAMS((int));
+HIDDEN extern int _rl_replace_text PARAMS((const char *, int, int));
+HIDDEN extern int _rl_forward_char_internal PARAMS((int));
+HIDDEN extern int _rl_insert_char PARAMS((int, int));
+HIDDEN extern int _rl_overwrite_char PARAMS((int, int));
+HIDDEN extern int _rl_overwrite_rubout PARAMS((int, int));
+HIDDEN extern int _rl_rubout_char PARAMS((int, int));
#if defined (HANDLE_MULTIBYTE)
-extern int _rl_char_search_internal PARAMS((int, int, char *, int));
+HIDDEN extern int _rl_char_search_internal PARAMS((int, int, char *, int));
#else
-extern int _rl_char_search_internal PARAMS((int, int, int));
+HIDDEN extern int _rl_char_search_internal PARAMS((int, int, int));
#endif
-extern int _rl_set_mark_at_pos PARAMS((int));
+HIDDEN extern int _rl_set_mark_at_pos PARAMS((int));
/* undo.c */
-extern UNDO_LIST *_rl_copy_undo_entry PARAMS((UNDO_LIST *));
-extern UNDO_LIST *_rl_copy_undo_list PARAMS((UNDO_LIST *));
-extern void _rl_free_undo_list PARAMS((UNDO_LIST *));
+HIDDEN extern UNDO_LIST *_rl_copy_undo_entry PARAMS((UNDO_LIST *));
+HIDDEN extern UNDO_LIST *_rl_copy_undo_list PARAMS((UNDO_LIST *));
+HIDDEN extern void _rl_free_undo_list PARAMS((UNDO_LIST *));
/* util.c */
#if defined (USE_VARARGS) && defined (PREFER_STDARG)
-extern void _rl_ttymsg (const char *, ...) __attribute__((__format__ (printf,
1, 2)));
-extern void _rl_errmsg (const char *, ...) __attribute__((__format__ (printf,
1, 2)));
-extern void _rl_trace (const char *, ...) __attribute__((__format__ (printf,
1, 2)));
+HIDDEN extern void _rl_ttymsg (const char *, ...) __attribute__((__format__
(printf, 1, 2)));
+HIDDEN extern void _rl_errmsg (const char *, ...) __attribute__((__format__
(printf, 1, 2)));
+HIDDEN extern void _rl_trace (const char *, ...) __attribute__((__format__
(printf, 1, 2)));
#else
-extern void _rl_ttymsg ();
-extern void _rl_errmsg ();
-extern void _rl_trace ();
+HIDDEN extern void _rl_ttymsg ();
+HIDDEN extern void _rl_errmsg ();
+HIDDEN extern void _rl_trace ();
#endif
-extern void _rl_audit_tty PARAMS((char *));
+HIDDEN extern void _rl_audit_tty PARAMS((char *));
-extern int _rl_tropen PARAMS((void));
+HIDDEN extern int _rl_tropen PARAMS((void));
-extern int _rl_abort_internal PARAMS((void));
-extern int _rl_null_function PARAMS((int, int));
-extern char *_rl_strindex PARAMS((const char *, const char *));
-extern int _rl_qsort_string_compare PARAMS((char **, char **));
+HIDDEN extern int _rl_abort_internal PARAMS((void));
+HIDDEN extern int _rl_null_function PARAMS((int, int));
+HIDDEN extern char *_rl_strindex PARAMS((const char *, const char *));
+HIDDEN extern int _rl_qsort_string_compare PARAMS((char **, char **));
extern int (_rl_uppercase_p) PARAMS((int));
extern int (_rl_lowercase_p) PARAMS((int));
-extern int (_rl_pure_alphabetic) PARAMS((int));
+HIDDEN extern int (_rl_pure_alphabetic) PARAMS((int));
extern int (_rl_digit_p) PARAMS((int));
extern int (_rl_to_lower) PARAMS((int));
extern int (_rl_to_upper) PARAMS((int));
extern int (_rl_digit_value) PARAMS((int));
/* vi_mode.c */
-extern void _rl_vi_initialize_line PARAMS((void));
-extern void _rl_vi_reset_last PARAMS((void));
-extern void _rl_vi_set_last PARAMS((int, int, int));
-extern int _rl_vi_textmod_command PARAMS((int));
-extern int _rl_vi_motion_command PARAMS((int));
-extern void _rl_vi_done_inserting PARAMS((void));
-extern int _rl_vi_domove_callback PARAMS((_rl_vimotion_cxt *));
+HIDDEN extern void _rl_vi_initialize_line PARAMS((void));
+HIDDEN extern void _rl_vi_reset_last PARAMS((void));
+HIDDEN extern void _rl_vi_set_last PARAMS((int, int, int));
+HIDDEN extern int _rl_vi_textmod_command PARAMS((int));
+HIDDEN extern int _rl_vi_motion_command PARAMS((int));
+HIDDEN extern void _rl_vi_done_inserting PARAMS((void));
+HIDDEN extern int _rl_vi_domove_callback PARAMS((_rl_vimotion_cxt *));
/*************************************************************************
* Undocumented private variables *
*************************************************************************/
/* bind.c */
-extern const char * const _rl_possible_control_prefixes[];
-extern const char * const _rl_possible_meta_prefixes[];
+HIDDEN extern const char * const _rl_possible_control_prefixes[];
+HIDDEN extern const char * const _rl_possible_meta_prefixes[];
/* callback.c */
-extern _rl_callback_func_t *_rl_callback_func;
-extern _rl_callback_generic_arg *_rl_callback_data;
+HIDDEN extern _rl_callback_func_t *_rl_callback_func;
+HIDDEN extern _rl_callback_generic_arg *_rl_callback_data;
/* complete.c */
-extern int _rl_complete_show_all;
-extern int _rl_complete_show_unmodified;
-extern int _rl_complete_mark_directories;
-extern int _rl_complete_mark_symlink_dirs;
-extern int _rl_completion_prefix_display_length;
-extern int _rl_completion_columns;
-extern int _rl_print_completions_horizontally;
-extern int _rl_completion_case_fold;
-extern int _rl_completion_case_map;
-extern int _rl_match_hidden_files;
-extern int _rl_page_completions;
-extern int _rl_skip_completed_text;
-extern int _rl_menu_complete_prefix_first;
+HIDDEN extern int _rl_complete_show_all;
+HIDDEN extern int _rl_complete_show_unmodified;
+HIDDEN extern int _rl_complete_mark_directories;
+HIDDEN extern int _rl_complete_mark_symlink_dirs;
+HIDDEN extern int _rl_completion_prefix_display_length;
+HIDDEN extern int _rl_completion_columns;
+HIDDEN extern int _rl_print_completions_horizontally;
+HIDDEN extern int _rl_completion_case_fold;
+HIDDEN extern int _rl_completion_case_map;
+HIDDEN extern int _rl_match_hidden_files;
+HIDDEN extern int _rl_page_completions;
+HIDDEN extern int _rl_skip_completed_text;
+HIDDEN extern int _rl_menu_complete_prefix_first;
/* display.c */
-extern int _rl_vis_botlin;
-extern int _rl_last_c_pos;
-extern int _rl_suppress_redisplay;
-extern int _rl_want_redisplay;
-
-extern char *_rl_emacs_mode_str;
-extern int _rl_emacs_modestr_len;
-extern char *_rl_vi_ins_mode_str;
-extern int _rl_vi_ins_modestr_len;
-extern char *_rl_vi_cmd_mode_str;
-extern int _rl_vi_cmd_modestr_len;
+HIDDEN extern int _rl_vis_botlin;
+HIDDEN extern int _rl_last_c_pos;
+HIDDEN extern int _rl_suppress_redisplay;
+HIDDEN extern int _rl_want_redisplay;
+
+HIDDEN extern char *_rl_emacs_mode_str;
+HIDDEN extern int _rl_emacs_modestr_len;
+HIDDEN extern char *_rl_vi_ins_mode_str;
+HIDDEN extern int _rl_vi_ins_modestr_len;
+HIDDEN extern char *_rl_vi_cmd_mode_str;
+HIDDEN extern int _rl_vi_cmd_modestr_len;
/* isearch.c */
-extern char *_rl_isearch_terminators;
+HIDDEN extern char *_rl_isearch_terminators;
-extern _rl_search_cxt *_rl_iscxt;
+HIDDEN extern _rl_search_cxt *_rl_iscxt;
/* macro.c */
-extern char *_rl_executing_macro;
+HIDDEN extern char *_rl_executing_macro;
/* misc.c */
-extern int _rl_history_preserve_point;
-extern int _rl_history_saved_point;
+HIDDEN extern int _rl_history_preserve_point;
+HIDDEN extern int _rl_history_saved_point;
-extern _rl_arg_cxt _rl_argcxt;
+HIDDEN extern _rl_arg_cxt _rl_argcxt;
/* nls.c */
-extern int _rl_utf8locale;
+HIDDEN extern int _rl_utf8locale;
/* readline.c */
-extern int _rl_echoing_p;
-extern int _rl_horizontal_scroll_mode;
-extern int _rl_mark_modified_lines;
-extern int _rl_bell_preference;
-extern int _rl_meta_flag;
-extern int _rl_convert_meta_chars_to_ascii;
-extern int _rl_output_meta_chars;
-extern int _rl_bind_stty_chars;
-extern int _rl_revert_all_at_newline;
-extern int _rl_echo_control_chars;
-extern int _rl_show_mode_in_prompt;
-extern int _rl_enable_bracketed_paste;
-extern char *_rl_comment_begin;
-extern unsigned char _rl_parsing_conditionalized_out;
-extern Keymap _rl_keymap;
-extern FILE *_rl_in_stream;
-extern FILE *_rl_out_stream;
-extern int _rl_last_command_was_kill;
-extern int _rl_eof_char;
-extern procenv_t _rl_top_level;
-extern _rl_keyseq_cxt *_rl_kscxt;
-extern int _rl_keyseq_timeout;
-
-extern int _rl_executing_keyseq_size;
+HIDDEN extern int _rl_echoing_p;
+HIDDEN extern int _rl_horizontal_scroll_mode;
+HIDDEN extern int _rl_mark_modified_lines;
+HIDDEN extern int _rl_bell_preference;
+HIDDEN extern int _rl_meta_flag;
+HIDDEN extern int _rl_convert_meta_chars_to_ascii;
+HIDDEN extern int _rl_output_meta_chars;
+HIDDEN extern int _rl_bind_stty_chars;
+HIDDEN extern int _rl_revert_all_at_newline;
+HIDDEN extern int _rl_echo_control_chars;
+HIDDEN extern int _rl_show_mode_in_prompt;
+HIDDEN extern int _rl_enable_bracketed_paste;
+HIDDEN extern char *_rl_comment_begin;
+HIDDEN extern unsigned char _rl_parsing_conditionalized_out;
+HIDDEN extern Keymap _rl_keymap;
+HIDDEN extern FILE *_rl_in_stream;
+HIDDEN extern FILE *_rl_out_stream;
+HIDDEN extern int _rl_last_command_was_kill;
+HIDDEN extern int _rl_eof_char;
+HIDDEN extern procenv_t _rl_top_level;
+HIDDEN extern _rl_keyseq_cxt *_rl_kscxt;
+HIDDEN extern int _rl_keyseq_timeout;
+
+HIDDEN extern int _rl_executing_keyseq_size;
/* search.c */
-extern _rl_search_cxt *_rl_nscxt;
+HIDDEN extern _rl_search_cxt *_rl_nscxt;
/* signals.c */
-extern int _rl_interrupt_immediately;
-extern int volatile _rl_caught_signal;
+HIDDEN extern int _rl_interrupt_immediately;
+HIDDEN extern int volatile _rl_caught_signal;
-extern _rl_sigcleanup_func_t *_rl_sigcleanup;
-extern void *_rl_sigcleanarg;
+HIDDEN extern _rl_sigcleanup_func_t *_rl_sigcleanup;
+HIDDEN extern void *_rl_sigcleanarg;
-extern int _rl_echoctl;
+HIDDEN extern int _rl_echoctl;
-extern int _rl_intr_char;
-extern int _rl_quit_char;
-extern int _rl_susp_char;
+HIDDEN extern int _rl_intr_char;
+HIDDEN extern int _rl_quit_char;
+HIDDEN extern int _rl_susp_char;
/* terminal.c */
-extern int _rl_enable_keypad;
-extern int _rl_enable_meta;
-extern char *_rl_term_clreol;
-extern char *_rl_term_clrpag;
-extern char *_rl_term_im;
-extern char *_rl_term_ic;
-extern char *_rl_term_ei;
-extern char *_rl_term_DC;
-extern char *_rl_term_up;
-extern char *_rl_term_dc;
-extern char *_rl_term_cr;
-extern char *_rl_term_IC;
-extern char *_rl_term_forward_char;
-extern int _rl_screenheight;
-extern int _rl_screenwidth;
-extern int _rl_screenchars;
-extern int _rl_terminal_can_insert;
-extern int _rl_term_autowrap;
+HIDDEN extern int _rl_enable_keypad;
+HIDDEN extern int _rl_enable_meta;
+HIDDEN extern char *_rl_term_clreol;
+HIDDEN extern char *_rl_term_clrpag;
+HIDDEN extern char *_rl_term_im;
+HIDDEN extern char *_rl_term_ic;
+HIDDEN extern char *_rl_term_ei;
+HIDDEN extern char *_rl_term_DC;
+HIDDEN extern char *_rl_term_up;
+HIDDEN extern char *_rl_term_dc;
+HIDDEN extern char *_rl_term_cr;
+HIDDEN extern char *_rl_term_IC;
+HIDDEN extern char *_rl_term_forward_char;
+HIDDEN extern int _rl_screenheight;
+HIDDEN extern int _rl_screenwidth;
+HIDDEN extern int _rl_screenchars;
+HIDDEN extern int _rl_terminal_can_insert;
+HIDDEN extern int _rl_term_autowrap;
/* text.c */
-extern int _rl_optimize_typeahead;
+HIDDEN extern int _rl_optimize_typeahead;
/* undo.c */
-extern int _rl_doing_an_undo;
-extern int _rl_undo_group_level;
+HIDDEN extern int _rl_doing_an_undo;
+HIDDEN extern int _rl_undo_group_level;
/* vi_mode.c */
-extern int _rl_vi_last_command;
-extern _rl_vimotion_cxt *_rl_vimvcxt;
+HIDDEN extern int _rl_vi_last_command;
+HIDDEN extern _rl_vimotion_cxt *_rl_vimvcxt;
#endif /* _RL_PRIVATE_H_ */
diff --git a/terminal.c b/terminal.c
index 495b87a..e9abde9 100644
--- a/terminal.c
+++ b/terminal.c
@@ -113,9 +113,9 @@ char PC, *BC, *UP;
char *_rl_term_clreol;
char *_rl_term_clrpag;
char *_rl_term_cr;
-char *_rl_term_backspace;
-char *_rl_term_goto;
-char *_rl_term_pc;
+HIDDEN char *_rl_term_backspace;
+HIDDEN char *_rl_term_goto;
+HIDDEN char *_rl_term_pc;
/* Non-zero if we determine that the terminal can do character insertion. */
int _rl_terminal_can_insert = 0;
@@ -124,7 +124,7 @@ int _rl_terminal_can_insert = 0;
char *_rl_term_im;
char *_rl_term_ei;
char *_rl_term_ic;
-char *_rl_term_ip;
+HIDDEN char *_rl_term_ip;
char *_rl_term_IC;
/* How to delete characters. */
diff --git a/util.c b/util.c
index e75e255..d808ba7 100644
--- a/util.c
+++ b/util.c
@@ -66,7 +66,7 @@
/* Return 0 if C is not a member of the class of characters that belong
in words, or 1 if it is. */
-int _rl_allow_pathname_alphabetic_chars = 0;
+HIDDEN int _rl_allow_pathname_alphabetic_chars = 0;
static const char * const pathname_alphabetic_chars = "/-_=~.#$";
int
diff --git a/xmalloc.h b/xmalloc.h
index f40d7a5..126fa0c 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -38,8 +38,8 @@
#endif /* !PTR_T */
-extern PTR_T xmalloc PARAMS((size_t));
-extern PTR_T xrealloc PARAMS((void *, size_t));
-extern void xfree PARAMS((void *));
+HIDDEN extern PTR_T xmalloc PARAMS((size_t));
+HIDDEN extern PTR_T xrealloc PARAMS((void *, size_t));
+HIDDEN extern void xfree PARAMS((void *));
#endif /* _XMALLOC_H_ */
--
2.4.6
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Bug-readline] [PATCH] Stop exposing undocumentated _rl_* symbols from libreadline.so,
Дилян Палаузов <=