summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-07 23:39:47 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-07 23:39:47 +0000
commit315e4f513be2c2f6bf492ebc49d384957fb70f88 (patch)
treef5c5116d523e40894100033be65040e98e3f81e6 /source3
parent5bc835c188a00ff2662f67301218d4e1548993b1 (diff)
downloadsamba-315e4f513be2c2f6bf492ebc49d384957fb70f88.tar.gz
samba-315e4f513be2c2f6bf492ebc49d384957fb70f88.tar.bz2
samba-315e4f513be2c2f6bf492ebc49d384957fb70f88.zip
Ensure we don't get problems between FILE and X_FILE buffers - always use the
x_ varient of the command. Andrew Bartlett (This used to be commit 6a028507f0d5eadd2ec0a5b45c35e3a019a56f0b)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/readline.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/readline.c b/source3/lib/readline.c
index 58c4ecf482..c0ccf44715 100644
--- a/source3/lib/readline.c
+++ b/source3/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