From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 15 Sep 2007 21:26:53 +0000 (+0000)
Subject: Rejig the word wrapping code for the "Compile-time options:" of perl -V
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=389d73ad6f106f474f96f66f3c697e579c3fbd9e;p=p5sagit%2Fp5-mst-13.2.git

Rejig the word wrapping code for the "Compile-time options:" of perl -V
Replace the rather elegant C code with Perl code that can also sort the
options first, as this will allow them to be split into those that
affect binary compatibility, and those that do not.

p4raw-id: //depot/perl@31872
---

diff --git a/perl.c b/perl.c
index e62ac99..e133346 100644
--- a/perl.c
+++ b/perl.c
@@ -1800,17 +1800,9 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 
 		Perl_av_create_and_push(aTHX_ &PL_preambleav, newSVpvs("use Config;"));
 		if (*++s != ':')  {
-		    STRLEN opts;
-		
-		    opts_prog = newSVpvs("print Config::myconfig(),");
-#ifdef VMS
-		    sv_catpvs(opts_prog,"\"\\nCharacteristics of this PERLSHR image: \\n");
-#else
-		    sv_catpvs(opts_prog,"\"\\nCharacteristics of this binary (from libperl): \\n");
-#endif
-		    opts = SvCUR(opts_prog);
-
-		    Perl_sv_catpv(aTHX_ opts_prog,"  Compile-time options:"
+		    /* Can't do newSVpvs() as that would involve pre-processor
+		       condititionals inside a macro expansion.  */
+		    opts_prog = Perl_newSVpv(aTHX_ "$_ = join ' ', sort qw("
 #  ifdef DEBUGGING
 			     " DEBUGGING"
 #  endif
@@ -1925,28 +1917,17 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 #  ifdef USE_SOCKS
 			     " USE_SOCKS"
 #  endif
-			     );
-
-		    while (SvCUR(opts_prog) > opts+76) {
-			/* find last space after "options: " and before col 76
-			 */
-
-			const char *space;
-			char * const pv = SvPV_nolen(opts_prog);
-			const char c = pv[opts+76];
-			pv[opts+76] = '\0';
-			space = strrchr(pv+opts+26, ' ');
-			pv[opts+76] = c;
-			if (!space) break; /* "Can't happen" */
+					     , 0);
 
-			/* break the line before that space */
-
-			opts = space - pv;
-			Perl_sv_insert(aTHX_ opts_prog, opts, 0,
-				  STR_WITH_LEN("\\n                       "));
-		    }
+		    /* Terminate the qw(, and then wrap at 76 columns.  */
+		    sv_catpvs(opts_prog, "); s/(?=.{53})(.{1,53}) /$1\\n                        /mg;print Config::myconfig(),");
+#ifdef VMS
+		    sv_catpvs(opts_prog,"\"\\nCharacteristics of this PERLSHR image: \\n");
+#else
+		    sv_catpvs(opts_prog,"\"\\nCharacteristics of this binary (from libperl): \\n");
+#endif
 
-		    sv_catpvs(opts_prog,"\\n\",");
+		    sv_catpvs(opts_prog,"  Compile-time options: $_\\n\",");
 
 #if defined(LOCAL_PATCH_COUNT)
 		    if (LOCAL_PATCH_COUNT > 0) {