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

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

1 files changed, 9 insertions, 9 deletions

diff --git a/scp.c b/scp.c
index 43fd50c9e..bf9db97cf 100644
--- 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);