diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-03-18 23:41:53 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-03-18 23:41:53 +0000 |
| commit | bc25293f96fb559b875d03e6ddbd9079b4af9dff (patch) | |
| tree | df695c86979cc74c6311967e68e256f5fb2fc5f5 /source3/include | |
| parent | cf313f6232e02577b0d79cc90e74cf8f20a81896 (diff) | |
| download | samba-bc25293f96fb559b875d03e6ddbd9079b4af9dff.tar.gz samba-bc25293f96fb559b875d03e6ddbd9079b4af9dff.tar.bz2 samba-bc25293f96fb559b875d03e6ddbd9079b4af9dff.zip | |
much simpler readline code
should work with readline 2.x
(This used to be commit 7940b6b0cf614ac72266d9e600220c9a9dbd2a43)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 5 | ||||
| -rw-r--r-- | source3/include/smb_readline.h | 46 |
3 files changed, 1 insertions, 52 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index f2c185e086..f81a5e3362 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -616,8 +616,6 @@ extern int errno; #include "messages.h" #include "util_list.h" -#include "smb_readline.h" /* SSS: samba readline support */ - #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 2abbada5a7..d2d96c4c60 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -166,10 +166,7 @@ void pidfile_create(char *name); /*The following definitions come from lib/readline.c */ -void smb_rl_read_char (void); -void init_smb_readline(char *prg_name, char *cline_ptr, int *event_ptr); -void smb_readline_prompt(char *prompt); -void smb_readline_remove_handler(void); +char *smb_readline(char *prompt, void (*callback)(void)); void cmd_history(void); /*The following definitions come from lib/replace.c */ diff --git a/source3/include/smb_readline.h b/source3/include/smb_readline.h deleted file mode 100644 index 1b46c5f6ea..0000000000 --- a/source3/include/smb_readline.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - Unix SMB/Netbios implementation. - Version 3.0. - SMB client - Copyright (C) Simo Sorce 2001 - - This program 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 2 of the License, or - (at your option) any later version. - - This program 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 this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifdef HAVE_LIBREADLINE -# ifdef HAVE_READLINE_READLINE_H -# include <readline/readline.h> -# ifdef HAVE_READLINE_HISTORY_H -# include <readline/history.h> -# endif -# else -# ifdef HAVE_READLINE_H -# include <readline.h> -# ifdef HAVE_HISTORY_H -# include <history.h> -# endif -# else -# undef HAVE_LIBREADLINE -# endif -# endif -#endif - -#define RL_NO_EVENTS 0 -#define RL_GOT_LINE 1 -#define RL_GOT_EOF 2 -#define RL_ERROR -1 - - - |