summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/cli.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/ssh/cli.c')
-rw-r--r--usr.bin/ssh/cli.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/cli.c b/usr.bin/ssh/cli.c
index ec5927d7720..643da3076f2 100644
--- a/usr.bin/ssh/cli.c
+++ b/usr.bin/ssh/cli.c
@@ -1,8 +1,9 @@
#include "includes.h"
-RCSID("$OpenBSD: cli.c,v 1.7 2001/02/04 15:32:23 stevesk Exp $");
+RCSID("$OpenBSD: cli.c,v 1.8 2001/02/08 19:30:51 itojun Exp $");
#include "xmalloc.h"
#include "log.h"
+#include "cli.h"
#include <vis.h>
@@ -33,7 +34,7 @@ cli_open(int from_stdin)
cli_input = STDIN_FILENO;
cli_output = STDERR_FILENO;
} else {
- cli_input = cli_output = open("/dev/tty", O_RDWR);
+ cli_input = cli_output = open(_PATH_TTY, O_RDWR);
if (cli_input < 0)
fatal("You have no controlling tty. Cannot read passphrase.");
}
@@ -44,7 +45,7 @@ cli_open(int from_stdin)
}
static void
-cli_close()
+cli_close(void)
{
if (!cli_from_stdin && cli_input >= 0)
close(cli_input);
@@ -55,13 +56,13 @@ cli_close()
}
void
-intrcatch()
+intrcatch(int sig)
{
intr = 1;
}
static void
-cli_echo_disable()
+cli_echo_disable(void)
{
sigemptyset(&nset);
sigaddset(&nset, SIGTSTP);
@@ -84,7 +85,7 @@ cli_echo_disable()
}
static void
-cli_echo_restore()
+cli_echo_restore(void)
{
if (echo_modified != 0) {
tcsetattr(cli_input, TCSANOW, &otio);