Just like bio_out, bio_err needs the linebuffer filter on VMS

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/apps.c b/apps/apps.c
index b4307427a5d613e70bdbfb8d24977c82f05f3d2d..128f387593289bd4910acba36cc117ad0c728c1c 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2486,6 +2486,17 @@ BIO *dup_bio_out(int format)
     return b;
 }
 
+BIO *dup_bio_err(int format)
+{
+    BIO *b = BIO_new_fp(stderr,
+                        BIO_NOCLOSE | (istext(format) ? BIO_FP_TEXT : 0));
+#ifdef OPENSSL_SYS_VMS
+    if (istext(format))
+        b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
+#endif
+    return b;
+}
+
 void unbuffer(FILE *fp)
 {
     setbuf(fp, NULL);

diff --git a/apps/apps.h b/apps/apps.h
index 7be7325429156a8a3f0578a229ef32d3d63cdc6f..fc480e16c824f441fde3d1384e066762fb9c4f6d 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -156,6 +156,7 @@ extern BIO *bio_out;
 extern BIO *bio_err;
 BIO *dup_bio_in(int format);
 BIO *dup_bio_out(int format);
+BIO *dup_bio_err(int format);
 BIO *bio_open_owner(const char *filename, int format, int private);
 BIO *bio_open_default(const char *filename, char mode, int format);
 BIO *bio_open_default_quiet(const char *filename, char mode, int format);

diff --git a/apps/openssl.c b/apps/openssl.c
index d460a6b8862adc9d92bf9a3189f9b9a5697a074c..2d9ddaa56b59dfa83d51b60e7b5e47ddca16d536 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
     default_config_file = make_config_name();
     bio_in = dup_bio_in(FORMAT_TEXT);
     bio_out = dup_bio_out(FORMAT_TEXT);
-    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+    bio_err = dup_bio_err(FORMAT_TEXT);
 
 #if defined( OPENSSL_SYS_VMS)
     copied_argv = argv = copy_argv(&argc, argv);