diff options
| author | kris <kris@FreeBSD.org> | 2000-06-03 09:23:13 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-06-03 09:23:13 +0000 |
| commit | 1e512080749f8d6f629b397553564816f9fd4b6c (patch) | |
| tree | 743ab962aa39ff273c0450ff3520a9c1378b4b5a /crypto | |
| parent | 780d02839af90707e6c8e227c590b92483e3b348 (diff) | |
| download | FreeBSD-src-1e512080749f8d6f629b397553564816f9fd4b6c.zip FreeBSD-src-1e512080749f8d6f629b397553564816f9fd4b6c.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/ssh.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h index df61945..8024f51 100644 --- a/crypto/openssh/ssh.h +++ b/crypto/openssh/ssh.h @@ -14,7 +14,7 @@ * $FreeBSD$ */ -/* RCSID("$Id: ssh.h,v 1.45 2000/05/08 17:12:16 markus Exp $"); */ +/* RCSID("$Id: ssh.h,v 1.46 2000/05/17 08:20:15 markus Exp $"); */ #ifndef SSH_H #define SSH_H @@ -455,6 +455,12 @@ void fatal_remove_cleanup(void (*proc) (void *context), void *context); */ char *tilde_expand_filename(const char *filename, uid_t my_uid); +/* remove newline at end of string */ +char *chop(char *s); + +/* set filedescriptor to non-blocking */ +void set_nonblock(int fd); + /* * Performs the interactive session. This handles data transmission between * the client and the program. Note that the notion of stdin, stdout, and |
