Restrict 79761 to Solaris.

git-svn-id: https://svn.r-project.org/R/trunk@80152 00db46b3-68df-0310-9c12-caf00c1e9a41

src/main/printutils.c

@@ -407,6 +407,9 @@ int Rstrwid(const char *str, int slen, cetype_t ienc, int quote)
 	/* Need to avoid mbtrowc on Solaris, where it only covers the BMP
 	   so we set ienc for unmarked strings in a UTF-8 locale */
 	Rboolean useUTF8 = (ienc == CE_UTF8) || utf8locale;
+	if (ienc == CE_LATIN1)
+	    /* Future-proof, cannot happen now. */
+	    warning("unexpected encoding (%d) in Rstrwid", ienc);
 #else
 	Rboolean useUTF8 = (ienc == CE_UTF8);
 #endif
@@ -613,6 +616,7 @@ const char *EncodeString(SEXP s, int w, int quote, Rprt_adj justify)
 		ienc = CE_UTF8;
 	    }
 #endif
+#ifdef __sun
 	} else if(ienc == CE_LATIN1) {
 	    p = translateCharUTF8(s);
 	    if(p == CHAR(s)) {
@@ -623,6 +627,7 @@ const char *EncodeString(SEXP s, int w, int quote, Rprt_adj justify)
 		i = Rstrwid(p, cnt, CE_UTF8, quote);
 	    }
 	    ienc = CE_UTF8;
+#endif
 	} else {
 	    if (useUTF8 && ienc == CE_UTF8) {
 		p = CHAR(s);
@@ -670,6 +675,7 @@ const char *EncodeString(SEXP s, int w, int quote, Rprt_adj justify)
 #ifdef __sun
 	/* Need to avoid mbtrowc on Solaris, where it only covers the BMP
 	   so we set ienc for unmarked strings in a UTF-8 locale */
+	/* Latin-1 string would have been converted to UTF-8 above. */
 	Rboolean useUTF8 = (ienc == CE_UTF8) || utf8locale;
 #else
 	Rboolean useUTF8 = (ienc == CE_UTF8);