More 64-bit fixing. One known bug of that kind

remains, 32-bit platforms using long long in
the test t/pragma/utf8 subtests 1-3 fail.
(Update: change	#3884 fixed that one.)

p4raw-link: @3884 (not found)

p4raw-id: //depot/cfgperl@3880

1 files changed, 15 insertions, 4 deletions

diff --git a/sv.c b/sv.c
index a7e3839952..2257516fae 100644
--- a/sv.c
+++ b/sv.c
@@ -5193,10 +5193,21 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 		SV *msg = sv_newmortal();
 		Perl_sv_setpvf(aTHX_ msg, "Invalid conversion in %s: ",
 			  (PL_op->op_type == OP_PRTF) ? "printf" : "sprintf");
-		if (c)
-		    Perl_sv_catpvf(aTHX_ msg, isPRINT(c) ? "\"%%%c\"" : "\"%%\\%03o\"",
-			      c & 0xFF);
-		else
+		if (c) {
+#ifdef UV_IS_QUAD
+		    if (isPRINT(c))
+			Perl_sv_catpvf(aTHX_ msg, 
+				       "\"%%%c\"", c & 0xFF);
+		    else
+			Perl_sv_catpvf(aTHX_ msg,
+				       "\"%%\\%03" PERL_PRIo64 "\"",
+				       (UV)c & 0xFF);
+#else
+		    Perl_sv_catpvf(aTHX_ msg, isPRINT(c) ?
+				   "\"%%%c\"" : "\"%%\\%03o\"",
+				   c & 0xFF);
+#endif
+		} else
 		    sv_catpv(msg, "end of string");
 		Perl_warner(aTHX_ WARN_PRINTF, "%_", msg); /* yes, this is reentrant */
 	    }