From 36734afdd8f0cf0daa664b8448728cdff0ca1550 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 15 Feb 2017 08:54:21 +0000 Subject: Hide or fix some warnings. --- pty.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'pty.c') diff --git a/pty.c b/pty.c index 012e2f1c..44f609de 100644 --- a/pty.c +++ b/pty.c @@ -33,23 +33,28 @@ int pty_open(int *); pid_t pty_fork(int, int *, char *, size_t, struct winsize *); +#ifdef __OpenBSD__ int pty_open(int *fd) { -#ifdef __OpenBSD__ *fd = open(PATH_PTMDEV, O_RDWR|O_CLOEXEC); if (*fd < 0) return (-1); + return (0); +} #else +int +pty_open(__unused int *fd) +{ *fd = -1; -#endif return (0); } +#endif +#ifdef __OpenBSD__ pid_t pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws) { -#ifdef __OpenBSD__ struct ptmget ptm; pid_t pid; @@ -72,7 +77,12 @@ pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws) *fd = ptm.cfd; close(ptm.sfd); return (pid); +} #else +pid_t +pty_fork(__unused int ptmfd, int *fd, char *name, __unused size_t namelen, + struct winsize *ws) +{ return (forkpty(fd, name, NULL, ws)); -#endif } +#endif -- cgit