r23779: Change from v2 or later to v3 or later.

[samba.git] / source3 / lib / readline.c

diff --git a/source3/lib/readline.c b/source3/lib/readline.c
index 8b90c32c7f9f1066c388f2c3bef10248b5b5baab..e7bd48cef7f968773b0431aa83837df4abd31bc0 100644 (file)
--- a/source3/lib/readline.c
+++ b/source3/lib/readline.c
@@ -6,7 +6,7 @@
    
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -50,8 +50,8 @@
  Display the prompt and wait for input. Call callback() regularly
 ****************************************************************************/
 
-static char *smb_readline_replacement(char *prompt, void (*callback)(void), 
-                               char **(completion_fn)(char *text, int start, int end))
+static char *smb_readline_replacement(const char *prompt, void (*callback)(void), 
+                               char **(completion_fn)(const char *text, int start, int end))
 {
        fd_set fds;
        static pstring line;
@@ -59,8 +59,11 @@ static char *smb_readline_replacement(char *prompt, void (*callback)(void),
        int fd = x_fileno(x_stdin);
        char *ret;
 
-       x_fprintf(dbf, "%s", prompt);
-       x_fflush(dbf);
+       /* Prompt might be NULL in non-interactive mode. */
+       if (prompt) {
+               x_fprintf(x_stdout, "%s", prompt);
+               x_fflush(x_stdout);
+       }
 
        while (1) {
                timeout.tv_sec = 5;
@@ -82,37 +85,70 @@ static char *smb_readline_replacement(char *prompt, void (*callback)(void),
  Display the prompt and wait for input. Call callback() regularly.
 ****************************************************************************/
 
-char *smb_readline(char *prompt, void (*callback)(void), 
-                  char **(completion_fn)(char *text, int start, int end))
+char *smb_readline(const char *prompt, void (*callback)(void), 
+                  char **(completion_fn)(const char *text, int start, int end))
 {
+       char *ret;
+       BOOL interactive;
+
+       interactive = isatty(x_fileno(x_stdin)) || getenv("CLI_FORCE_INTERACTIVE");
+       if (!interactive) {
+           return smb_readline_replacement(NULL, callback, completion_fn);
+       }
+
 #if HAVE_LIBREADLINE
-       if (isatty(x_fileno(x_stdin))) {
-               char *ret;
-
-               /* Aargh!  Readline does bizzare things with the terminal width
-               that mucks up expect(1).  Set CLI_NO_READLINE in the environment
-               to force readline not to be used. */
-
-               if (getenv("CLI_NO_READLINE"))
-                       return smb_readline_replacement(prompt, callback, completion_fn);
-
-               if (completion_fn) {
-                       /* The callback prototype has changed slightly between
-                       different versions of Readline, so the same function
-                       works in all of them to date, but we get compiler
-                       warnings in some.  */
-                       rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn;
-               }
 
-               if (callback)
-                       rl_event_hook = (Function *)callback;
-               ret = readline(prompt);
-               if (ret && *ret)
-                       add_history(ret);
-               return ret;
-       } else
+       /* Aargh!  Readline does bizzare things with the terminal width
+       that mucks up expect(1).  Set CLI_NO_READLINE in the environment
+       to force readline not to be used. */
+
+       if (getenv("CLI_NO_READLINE"))
+               return smb_readline_replacement(prompt, callback, completion_fn);
+
+       if (completion_fn) {
+               /* The callback prototype has changed slightly between
+               different versions of Readline, so the same function
+               works in all of them to date, but we get compiler
+               warnings in some.  */
+               rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn;
+       }
+
+#if HAVE_DECL_RL_EVENT_HOOK
+       if (callback)
+               rl_event_hook = (Function *)callback;
+#endif
+       ret = readline(prompt);
+       if (ret && *ret)
+               add_history(ret);
+
+#else
+       ret = smb_readline_replacement(prompt, callback, completion_fn);
+#endif
+
+       return ret;
+}
+
+/****************************************************************************
+ * return line buffer text
+ ****************************************************************************/
+const char *smb_readline_get_line_buffer(void)
+{
+#if defined(HAVE_LIBREADLINE)
+       return rl_line_buffer;
+#else
+       return NULL;
+#endif
+}
+
+
+/****************************************************************************
+ * set completion append character
+ ***************************************************************************/
+void smb_readline_ca_char(char c)
+{
+#if defined(HAVE_LIBREADLINE)
+       rl_completion_append_character = c;
 #endif
-       return smb_readline_replacement(prompt, callback, completion_fn);
 }
 
 /****************************************************************************
@@ -120,7 +156,7 @@ history
 ****************************************************************************/
 int cmd_history(void)
 {
-#if defined(HAVE_LIBREADLINE)
+#if defined(HAVE_LIBREADLINE) && defined(HAVE_HISTORY_LIST)
        HIST_ENTRY **hlist;
        int i;
 
@@ -135,3 +171,4 @@ int cmd_history(void)
 
        return 0;
 }
+