From 31ca54aa86a90052f8fe73fda66c7f39fd5079bc Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 9 Feb 2001 02:11:24 +0000 Subject: - 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 --- ssh.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ssh.c') diff --git a/ssh.c b/ssh.c index 730ff382c..1d7582333 100644 --- a/ssh.c +++ b/ssh.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.88 2001/02/04 15:32:26 stevesk Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.93 2001/02/08 19:30:52 itojun Exp $"); #include #include @@ -145,12 +145,12 @@ int subsystem_flag = 0; /* Prints a help message to the user. This function never returns. */ void -usage() +usage(void) { fprintf(stderr, "Usage: %s [options] host [command]\n", __progname); fprintf(stderr, "Options:\n"); fprintf(stderr, " -l user Log in using this user name.\n"); - fprintf(stderr, " -n Redirect input from /dev/null.\n"); + fprintf(stderr, " -n Redirect input from " _PATH_DEVNULL ".\n"); fprintf(stderr, " -A Enable authentication agent forwarding.\n"); fprintf(stderr, " -a Disable authentication agent forwarding.\n"); #ifdef AFS @@ -724,7 +724,7 @@ x11_get_proto(char *proto, int proto_len, char *data, int data_len) if (options.xauth_location) { /* Try to get Xauthority information for the display. */ - snprintf(line, sizeof line, "%.100s list %.200s 2>/dev/null", + snprintf(line, sizeof line, "%.100s list %.200s 2>" _PATH_DEVNULL, options.xauth_location, getenv("DISPLAY")); f = popen(line, "r"); if (f && fgets(line, sizeof(line), f) && @@ -1019,7 +1019,7 @@ ssh_session2(void) int in, out, err; if (stdin_null_flag) { - in = open("/dev/null", O_RDONLY); + in = open(_PATH_DEVNULL, O_RDONLY); } else { in = dup(STDIN_FILENO); } -- cgit v1.2.3