- biorn@cvs.openbsd.org 2006/03/16 10:31:45

     [scp.c]
     Try to display errormessage even if remout == -1
     ok djm@, markus@

diff --git a/ChangeLog b/ChangeLog
index 9d8dee10291ec2b95834b4d65378af872441acdc..c1fef437e17d55f75de4e09e54be792202cae48f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/scp.c b/scp.c
index 43fd50c9ee593efa8d5c4230508d5e57da74b9cf..bf9db97cf49c0feb5189302274d5245a972560ef 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -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);