diff options
| author | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
| commit | a632b4789caf015f977f45e2d106cc00efa1239f (patch) | |
| tree | eb8a772c0dc7204d341277f265caa0c7c543c32c /crypto/openssh/pty.c | |
| parent | 8cf8ce7bb13515db269566309a8e9cd8b309ee56 (diff) | |
| download | FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.zip FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.tar.gz | |
Resolve conflicts and update for FreeBSD.
Diffstat (limited to 'crypto/openssh/pty.c')
| -rw-r--r-- | crypto/openssh/pty.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/openssh/pty.c b/crypto/openssh/pty.c index c354529..d14a03f 100644 --- a/crypto/openssh/pty.c +++ b/crypto/openssh/pty.c @@ -1,27 +1,27 @@ /* - * + * * pty.c - * + * * Author: Tatu Ylonen <ylo@cs.hut.fi> - * + * * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved - * + * * Created: Fri Mar 17 04:37:25 1995 ylo - * + * * Allocating a pseudo-terminal, and making it the controlling tty. - * + * * $FreeBSD$ */ #include "includes.h" -RCSID("$Id: pty.c,v 1.12 2000/02/15 16:52:58 markus Exp $"); +RCSID("$Id: pty.c,v 1.13 2000/04/14 10:30:32 markus Exp $"); #ifdef __FreeBSD__ #include <libutil.h> #else #include <util.h> -#endif +#endif /* __FreeBSD__ */ #include "pty.h" #include "ssh.h" @@ -41,7 +41,7 @@ RCSID("$Id: pty.c,v 1.12 2000/02/15 16:52:58 markus Exp $"); * returned (the buffer must be able to hold at least 64 characters). */ -int +int pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) { #if defined(HAVE_OPENPTY) || defined(BSD4_4) @@ -179,7 +179,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) /* Releases the tty. Its ownership is returned to root, and permissions to 0666. */ -void +void pty_release(const char *ttyname) { if (chown(ttyname, (uid_t) 0, (gid_t) 0) < 0) @@ -190,7 +190,7 @@ pty_release(const char *ttyname) /* Makes the tty the processes controlling tty and sets it to sane modes. */ -void +void pty_make_controlling_tty(int *ttyfd, const char *ttyname) { int fd; @@ -243,7 +243,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) /* Changes the window size associated with the pty. */ -void +void pty_change_window_size(int ptyfd, int row, int col, int xpixel, int ypixel) { |
