integrate change#3229 from maint-5.004

p4raw-link: @3229 on //depot/maint-5.004/perl: 3e0793ddbcfdff90910112e638ae702c43386bb6

p4raw-id: //depot/perl@3271

1 files changed, 11 insertions, 2 deletions

diff --git a/pp_ctl.c b/pp_ctl.c
index e29ff19997..7ac600b3f0 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1393,8 +1393,17 @@ die_where(char *message)
     }
     if (!message)
 	message = SvPVx(ERRSV, n_a);
-    PerlIO_printf(PerlIO_stderr(), "%s",message);
-    PerlIO_flush(PerlIO_stderr());
+    {
+#ifdef USE_SFIO
+	/* SFIO can really mess with your errno */
+	int e = errno;
+#endif
+	PerlIO_puts(PerlIO_stderr(), message);
+	(void)PerlIO_flush(PerlIO_stderr());
+#ifdef USE_SFIO
+	errno = e;
+#endif
+    }
     my_failure_exit();
     /* NOTREACHED */
     return 0;