diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-06-03 09:23:13 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-06-03 09:23:13 +0000 |
| commit | cfa18fd2ba09b1888cca5a4584a2712f84d01ae9 (patch) | |
| tree | fc1533bb89d9c7f6ad696d7bf3dc5ae52b19c6d4 /crypto/openssh | |
| parent | 48fb0b1aa92d6882739b8e8c8b83919e726157e8 (diff) | |
| download | src-cfa18fd2ba09b1888cca5a4584a2712f84d01ae9.tar.gz src-cfa18fd2ba09b1888cca5a4584a2712f84d01ae9.zip | |
Resolve conflicts
Notes
Notes:
svn path=/head/; revision=61208
Diffstat (limited to 'crypto/openssh')
| -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 df61945e336f..8024f51c8854 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 |