- itojun@cvs.openbsd.org 2001/02/08 19:30:52

     sync with netbsd tree changes.
     - more strict prototypes, include necessary headers
     - use paths.h/pathnames.h decls
     - size_t typecase to int -> u_long

1 files changed, 7 insertions, 6 deletions

diff --git a/cli.c b/cli.c
index 67a718b7c..6152a810e 100644
--- a/cli.c
+++ b/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"
 
 static int cli_input = -1;
 static int cli_output = -1;
@@ -31,7 +32,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.");
         }
@@ -42,7 +43,7 @@ cli_open(int from_stdin)
 }
 
 static void
-cli_close()
+cli_close(void)
 {
         if (!cli_from_stdin && cli_input >= 0)
                 close(cli_input);
@@ -53,13 +54,13 @@ cli_close()
 }
 
 void
-intrcatch()
+intrcatch(int sig)
 {
         intr = 1;
 }
 
 static void
-cli_echo_disable()
+cli_echo_disable(void)
 {
         sigemptyset(&nset);
         sigaddset(&nset, SIGTSTP);
@@ -82,7 +83,7 @@ cli_echo_disable()
 }
 
 static void
-cli_echo_restore()
+cli_echo_restore(void)
 {
         if (echo_modified != 0) {
                 tcsetattr(cli_input, TCSANOW, &otio);