diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | scp.c | 18 |
2 files changed, 14 insertions, 10 deletions
@@ -4,6 +4,10 @@ [ssh-keygen.c] if no key file are given when printing the DNS host record, use the host key file(s) as default. ok djm@ + - biorn@cvs.openbsd.org 2006/03/16 10:31:45 + [scp.c] + Try to display errormessage even if remout == -1 + ok djm@, markus@ 20060325 - OpenBSD CVS Sync @@ -4261,4 +4265,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4242 2006/03/26 02:48:01 djm Exp $ +$Id: ChangeLog,v 1.4243 2006/03/26 02:49:43 djm Exp $ @@ -1106,15 +1106,15 @@ run_err(const char *fmt,...) va_list ap; ++errs; - if (fp == NULL && !(fp = fdopen(remout, "w"))) - return; - (void) fprintf(fp, "%c", 0x01); - (void) fprintf(fp, "scp: "); - va_start(ap, fmt); - (void) vfprintf(fp, fmt, ap); - va_end(ap); - (void) fprintf(fp, "\n"); - (void) fflush(fp); + if (fp != NULL || (remout != -1 && (fp = fdopen(remout, "w")))) { + (void) fprintf(fp, "%c", 0x01); + (void) fprintf(fp, "scp: "); + va_start(ap, fmt); + (void) vfprintf(fp, fmt, ap); + va_end(ap); + (void) fprintf(fp, "\n"); + (void) fflush(fp); + } if (!iamremote) { va_start(ap, fmt); |