Merge branch 'gawk-4.1-stable' into feature/zOS-try2

4 files changed, 23 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b000aac5..66510495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-04         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pp_num): Use format_val to print integral values
+	as integers. Thanks to Hermann Peifer for the report.
+
 2015-08-28	Daniel Richard G.	<skunk@iSKUNK.ORG>
 
 	* Makefile.am, configure.ac: Use an Automake conditional to
diff --git a/profile.c b/profile.c
index 74fc4f9c..5af7b929 100644
--- a/profile.c
+++ b/profile.c
@@ -1343,9 +1343,19 @@ pp_number(NODE *n)
 	} else
 #endif
 	{
-		count = PP_PRECISION + 10;
-		emalloc(str, char *, count, "pp_number");
-		sprintf(str, "%0.*g", PP_PRECISION, n->numbr);
+		/* Use format_val() to get integral values printed as integers */
+		NODE *s;
+
+		getnode(s);
+		*s = *n;
+		s->flags &= ~STRCUR;
+
+		s = r_format_val("%.6g", 0, s);
+
+		s->stptr[s->stlen] = '\0';
+		str = s->stptr;
+
+		freenode(s);
 	}
 
 	return str;
diff --git a/test/ChangeLog b/test/ChangeLog
index ba2856b6..9d31f04d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-04         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.ok: Updated after code change.
+
 2015-08-28	Daniel Richard G.	<skunk@iSKUNK.ORG>
 
 	* Makefile.am: Generate the Maketests file without
diff --git a/test/profile5.ok b/test/profile5.ok
index bff767eb..2bae16b5 100644
--- a/test/profile5.ok
+++ b/test/profile5.ok
@@ -2872,7 +2872,7 @@
 		_MACPFX84SFX["\204"] = "_macpfx84"
 		_MACPFX84SFX["\224"] = "_macsfx94"
 		_MACPFX84SFX[""] = "_mpusfxsubret"
-		_VLDMAXSTRING = 1e+06
+		_VLDMAXSTRING = 1000000
 	}
 
 	function _macpfx84(F, D, C, p1, p2, p3)