projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates to svn:ignore: ignore libversion.a in the top-level directory
[u/mdw/putty]
/
unix
/
uxcons.c
diff --git
a/unix/uxcons.c
b/unix/uxcons.c
index
0468f3f
..
4c14eb6
100644
(file)
--- a/
unix/uxcons.c
+++ b/
unix/uxcons.c
@@
-7,8
+7,10
@@
#include <stdlib.h>
#include <stdarg.h>
#include <assert.h>
#include <stdlib.h>
#include <stdarg.h>
#include <assert.h>
+
#include <termios.h>
#include <unistd.h>
#include <termios.h>
#include <unistd.h>
+#include <fcntl.h>
#include "putty.h"
#include "storage.h"
#include "putty.h"
#include "storage.h"
@@
-326,31
+328,45
@@
void logevent(void *frontend, const char *string)
}
/*
}
/*
- * Special function
to print tex
t to the console for password
- * prompts and the like. Uses /dev/tty or std
err, in that order of
- * preference; also sanitises escape sequences out of the text, on
+ * Special function
s to read and prin
t to the console for password
+ * prompts and the like. Uses /dev/tty or std
in/stderr, in that order
+ *
of
preference; also sanitises escape sequences out of the text, on
* the basis that it might have been sent by a hostile SSH server
* doing malicious keyboard-interactive.
*/
* the basis that it might have been sent by a hostile SSH server
* doing malicious keyboard-interactive.
*/
-static void console_
prompt_text(FILE **confp, const char *data, int len
)
+static void console_
open(FILE **outfp, int *infd
)
{
{
- int
i
;
+ int
fd
;
- if (!*confp) {
- if ((*confp = fopen("/dev/tty", "w")) == NULL)
- *confp = stderr;
+ if ((fd = open("/dev/tty", O_RDWR)) >= 0) {
+ *infd = fd;
+ *outfp = fdopen(*infd, "w");
+ } else {
+ *infd = 0;
+ *outfp = stderr;
}
}
+}
+static void console_close(FILE *outfp, int infd)
+{
+ if (outfp != stderr)
+ fclose(outfp); /* will automatically close infd too */
+}
+
+static void console_prompt_text(FILE *outfp, const char *data, int len)
+{
+ int i;
for (i = 0; i < len; i++)
if ((data[i] & 0x60) || (data[i] == '\n'))
for (i = 0; i < len; i++)
if ((data[i] & 0x60) || (data[i] == '\n'))
- fputc(data[i],
*con
fp);
- fflush(
*con
fp);
+ fputc(data[i],
out
fp);
+ fflush(
out
fp);
}
int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
{
size_t curr_prompt;
}
int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
{
size_t curr_prompt;
- FILE *confp = NULL;
+ FILE *outfp = NULL;
+ int infd;
/*
* Zero all the results, in case we abort half-way through.
/*
* Zero all the results, in case we abort half-way through.
@@
-364,22
+380,24
@@
int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
if (p->n_prompts && console_batch_mode)
return 0;
if (p->n_prompts && console_batch_mode)
return 0;
+ console_open(&outfp, &infd);
+
/*
* Preamble.
*/
/* We only print the `name' caption if we have to... */
if (p->name_reqd && p->name) {
size_t l = strlen(p->name);
/*
* Preamble.
*/
/* We only print the `name' caption if we have to... */
if (p->name_reqd && p->name) {
size_t l = strlen(p->name);
- console_prompt_text(
&con
fp, p->name, l);
+ console_prompt_text(
out
fp, p->name, l);
if (p->name[l-1] != '\n')
if (p->name[l-1] != '\n')
- console_prompt_text(
&con
fp, "\n", 1);
+ console_prompt_text(
out
fp, "\n", 1);
}
/* ...but we always print any `instruction'. */
if (p->instruction) {
size_t l = strlen(p->instruction);
}
/* ...but we always print any `instruction'. */
if (p->instruction) {
size_t l = strlen(p->instruction);
- console_prompt_text(
&con
fp, p->instruction, l);
+ console_prompt_text(
out
fp, p->instruction, l);
if (p->instruction[l-1] != '\n')
if (p->instruction[l-1] != '\n')
- console_prompt_text(
&con
fp, "\n", 1);
+ console_prompt_text(
out
fp, "\n", 1);
}
for (curr_prompt = 0; curr_prompt < p->n_prompts; curr_prompt++) {
}
for (curr_prompt = 0; curr_prompt < p->n_prompts; curr_prompt++) {
@@
-388,32
+406,31
@@
int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
int i;
prompt_t *pr = p->prompts[curr_prompt];
int i;
prompt_t *pr = p->prompts[curr_prompt];
- tcgetattr(
0
, &oldmode);
+ tcgetattr(
infd
, &oldmode);
newmode = oldmode;
newmode.c_lflag |= ISIG | ICANON;
if (!pr->echo)
newmode.c_lflag &= ~ECHO;
else
newmode.c_lflag |= ECHO;
newmode = oldmode;
newmode.c_lflag |= ISIG | ICANON;
if (!pr->echo)
newmode.c_lflag &= ~ECHO;
else
newmode.c_lflag |= ECHO;
- tcsetattr(
0
, TCSANOW, &newmode);
+ tcsetattr(
infd
, TCSANOW, &newmode);
- console_prompt_text(
&con
fp, pr->prompt, strlen(pr->prompt));
+ console_prompt_text(
out
fp, pr->prompt, strlen(pr->prompt));
- i = read(
0
, pr->result, pr->result_len - 1);
+ i = read(
infd
, pr->result, pr->result_len - 1);
- tcsetattr(
0
, TCSANOW, &oldmode);
+ tcsetattr(
infd
, TCSANOW, &oldmode);
if (i > 0 && pr->result[i-1] == '\n')
i--;
pr->result[i] = '\0';
if (!pr->echo)
if (i > 0 && pr->result[i-1] == '\n')
i--;
pr->result[i] = '\0';
if (!pr->echo)
- console_prompt_text(
&con
fp, "\n", 1);
+ console_prompt_text(
out
fp, "\n", 1);
}
}
- if (confp && confp != stderr)
- fclose(confp);
+ console_close(outfp, infd);
return 1; /* success */
}
return 1; /* success */
}