Resolve conflicts

This commit is contained in:
Kris Kennaway 2000-06-03 09:23:13 +00:00
parent 48fb0b1aa9
commit cfa18fd2ba
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=61208

View File

@ -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