upstream commit
Prefer setvbuf() to setlinebuf() for portability; ok deraadt@
This commit is contained in:
parent
72bba3d179
commit
db995f2eed
6
sftp.c
6
sftp.c
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: sftp.c,v 1.167 2014/10/06 00:47:15 djm Exp $ */
|
||||
/* $OpenBSD: sftp.c,v 1.168 2014/11/26 18:34:51 millert Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
|
||||
*
|
||||
|
@ -2084,8 +2084,8 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
|
|||
free(dir);
|
||||
}
|
||||
|
||||
setlinebuf(stdout);
|
||||
setlinebuf(infile);
|
||||
setvbuf(stdout, NULL, _IOLBF, 0);
|
||||
setvbuf(infile, NULL, _IOLBF, 0);
|
||||
|
||||
interactive = !batchmode && isatty(STDIN_FILENO);
|
||||
err = 0;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ssh-add.c,v 1.113 2014/07/09 14:15:56 benno Exp $ */
|
||||
/* $OpenBSD: ssh-add.c,v 1.114 2014/11/26 18:34:51 millert Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
|
@ -437,7 +437,7 @@ main(int argc, char **argv)
|
|||
|
||||
OpenSSL_add_all_algorithms();
|
||||
|
||||
setlinebuf(stdout);
|
||||
setvbuf(stdout, NULL, _IOLBF, 0);
|
||||
|
||||
/* At first, get a connection to the authentication agent. */
|
||||
ac = ssh_get_authentication_connection();
|
||||
|
|
Loading…
Reference in New Issue