diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | pty.c | 18 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index f2645915..893efab9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ AM_CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations AM_CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare AM_CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align AM_CFLAGS += -Wdeclaration-after-statement -Wno-pointer-sign -Wno-attributes +AM_CFLAGS += -Wno-unused-result AM_CPPFLAGS += -DDEBUG endif if IS_COVERAGE @@ -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 |