empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client: Rewrite readline configuration

Browse source 
AX_LIB_READLINE tries to cope with systems where readline lacks
history support, or lacks headers, or needs headers included in
unorthodox ways.  It puts six HAVE_ macros into config.h, and its
usage example takes 24 lines of code just to include two headers.

Way too complicated for my taste.  Replace with new MY_LIB_READLINE,
which succeeds only when you have a sane readline, and then defines
*one* macro: HAVE_LIBREADLINE.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-12-07 21:27:42 +01:00
parent 60fee0e6ae
commit 1cbda2c7dd
7 changed files with 35 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/client/play.c
View file

@ -53,26 +53,9 @@
#include "secure.h"
#ifdef HAVE_LIBREADLINE
# if defined(HAVE_READLINE_READLINE_H)
# include <readline/readline.h>
# elif defined(HAVE_READLINE_H)
# include <readline.h>
# else /* !defined(HAVE_READLINE_H) */
extern char *readline ();
# endif /* !defined(HAVE_READLINE_H) */
#endif /* HAVE_LIBREADLINE */
#ifdef HAVE_READLINE_HISTORY
# if defined(HAVE_READLINE_HISTORY_H)
# include <readline/history.h>
# elif defined(HAVE_HISTORY_H)
# include <history.h>
# else /* !defined(HAVE_HISTORY_H) */
extern void add_history ();
extern int write_history ();
extern int read_history ();
# endif /* !defined(HAVE_HISTORY_H) */
#endif /* HAVE_READLINE_HISTORY */
#include <readline/readline.h>
#include <readline/history.h>
#endif
#define EOF_COOKIE "ctld\n"
#define INTR_COOKIE "aborted\n"
@ -446,10 +429,8 @@ input_handler(char *line)
{
input_from_rl = line;
has_rl_input = 1;
#ifdef HAVE_READLINE_HISTORY
if (line && *line)
add_history(line);
#endif /* HAVE_READLINE_HISTORY */
}
static int
@ -583,10 +564,8 @@ play(int sock, char *history_file)
sigaction(SIGPIPE, &sa, NULL);
#ifdef HAVE_LIBREADLINE
rl_already_prompted = 1;
#ifdef HAVE_READLINE_HISTORY
if (history_file)
read_history(history_file);
#endif /* HAVE_READLINE_HISTORY */
rl_bind_key('\t', rl_insert); /* Disable tab completion */
rl_callback_handler_install("", input_handler);
#endif /* HAVE_LIBREADLINE */
@ -692,10 +671,8 @@ play(int sock, char *history_file)
#ifdef HAVE_LIBREADLINE
rl_callback_handler_remove();
#ifdef HAVE_READLINE_HISTORY
if (history_file)
write_history(history_file);
#endif /* HAVE_READLINE_HISTORY */
#endif
return ret;
}