Merge from HEAD - don't mix FILE and X_FILE - fixes debian bug

http://bugs.debian.org/178219 where the first 4096 bytes where being chewed
into the FILE buffer, and never available to X_FILE's read.

Andrew Bartlett

diff --git a/source/lib/readline.c b/source/lib/readline.c
index 58c4ecf482dbb4c30f8690473501bff9371316d7..c0ccf44715da51a1a64625d09bf826302be6bb22 100644 (file)
--- a/source/lib/readline.c
+++ b/source/lib/readline.c
@@ -56,7 +56,7 @@ static char *smb_readline_replacement(char *prompt, void (*callback)(void),
        fd_set fds;
        static pstring line;
        struct timeval timeout;
-       int fd = fileno(stdin);
+       int fd = x_fileno(x_stdin);
        char *ret;
 
        x_fprintf(dbf, "%s", prompt);
@@ -70,7 +70,7 @@ static char *smb_readline_replacement(char *prompt, void (*callback)(void),
                FD_SET(fd,&fds);
        
                if (sys_select_intr(fd+1,&fds,NULL,NULL,&timeout) == 1) {
-                       ret = fgets(line, sizeof(line), stdin);
+                       ret = x_fgets(line, sizeof(line), x_stdin);
                        return ret;
                }
                if (callback)
@@ -86,7 +86,7 @@ char *smb_readline(char *prompt, void (*callback)(void),
                   char **(completion_fn)(char *text, int start, int end))
 {
 #if HAVE_LIBREADLINE
-       if (isatty(fileno(stdin))) {
+       if (isatty(fileno(x_stdin))) {
                char *ret;
 
                /* Aargh!  Readline does bizzare things with the terminal width