diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-12-23 02:11:02 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-12-23 02:11:02 +0000 |
commit | e7ee7fe602edcca6f55c445cd56775ab3b0a759d (patch) | |
tree | 0390a4316d86cc26acb05713a5837bc37753d9c3 | |
parent | 2594d9a06bb1b7e0d249a02e0c217280883bdbf0 (diff) |
- wcobb@cvs.openbsd.org 2002/11/26 00:45:03
[scp.c ssh-keygen.c]
Remove unnecessary fflush(stderr) calls, stderr is unbuffered by default.
ok markus@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | scp.c | 3 | ||||
-rw-r--r-- | ssh-keygen.c | 3 |
3 files changed, 7 insertions, 5 deletions
@@ -26,6 +26,10 @@ | |||
26 | - stevesk@cvs.openbsd.org 2002/11/24 21:46:24 | 26 | - stevesk@cvs.openbsd.org 2002/11/24 21:46:24 |
27 | [ssh-keysign.8] | 27 | [ssh-keysign.8] |
28 | typo: "the the" | 28 | typo: "the the" |
29 | - wcobb@cvs.openbsd.org 2002/11/26 00:45:03 | ||
30 | [scp.c ssh-keygen.c] | ||
31 | Remove unnecessary fflush(stderr) calls, stderr is unbuffered by default. | ||
32 | ok markus@ | ||
29 | 33 | ||
30 | 20021205 | 34 | 20021205 |
31 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org | 35 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org |
@@ -861,4 +865,4 @@ | |||
861 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 865 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
862 | ok provos@ | 866 | ok provos@ |
863 | 867 | ||
864 | $Id: ChangeLog,v 1.2522 2002/12/23 02:09:59 mouring Exp $ | 868 | $Id: ChangeLog,v 1.2523 2002/12/23 02:11:02 mouring Exp $ |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.92 2002/11/07 22:35:38 markus Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.93 2002/11/26 00:45:03 wcobb Exp $"); |
79 | 79 | ||
80 | #include "xmalloc.h" | 80 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
@@ -570,7 +570,6 @@ syserr: run_err("%s: %s", name, strerror(errno)); | |||
570 | #endif | 570 | #endif |
571 | if (verbose_mode) { | 571 | if (verbose_mode) { |
572 | fprintf(stderr, "Sending file modes: %s", buf); | 572 | fprintf(stderr, "Sending file modes: %s", buf); |
573 | fflush(stderr); | ||
574 | } | 573 | } |
575 | (void) atomicio(write, remout, buf, strlen(buf)); | 574 | (void) atomicio(write, remout, buf, strlen(buf)); |
576 | if (response() < 0) | 575 | if (response() < 0) |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 3478e3723..6a872bcfd 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.101 2002/06/23 09:39:55 deraadt Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.102 2002/11/26 00:45:03 wcobb Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -109,7 +109,6 @@ ask_filename(struct passwd *pw, const char *prompt) | |||
109 | 109 | ||
110 | snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); | 110 | snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); |
111 | fprintf(stderr, "%s (%s): ", prompt, identity_file); | 111 | fprintf(stderr, "%s (%s): ", prompt, identity_file); |
112 | fflush(stderr); | ||
113 | if (fgets(buf, sizeof(buf), stdin) == NULL) | 112 | if (fgets(buf, sizeof(buf), stdin) == NULL) |
114 | exit(1); | 113 | exit(1); |
115 | if (strchr(buf, '\n')) | 114 | if (strchr(buf, '\n')) |