Merge branch 'master' into select

1 files changed, 98 insertions, 19 deletions

diff --git a/builtin.c b/builtin.c
index b8e24cb3..875b3e5c 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2013 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -125,6 +125,11 @@ efwrite(const void *ptr,
 	return;
 
 wrerror:
+	/* die silently on EPIPE to stdout */
+	if (fp == stdout && errno == EPIPE)
+		gawk_exit(EXIT_FATAL);
+
+	/* otherwise die verbosely */
 	fatal(_("%s to \"%s\" failed (%s)"), from,
 		rp ? rp->value : _("standard output"),
 		errno ? strerror(errno) : _("reason unknown"));
@@ -464,9 +469,9 @@ double
 double_to_int(double d)
 {
 	if (d >= 0)
-		d = Floor(d);
+		d = floor(d);
 	else
-		d = Ceil(d);
+		d = ceil(d);
 	return d;
 }
 
@@ -714,7 +719,7 @@ format_tree(
 	mpz_ptr zi;
 	mpfr_ptr mf;
 #endif
-	enum { MP_INT_WITH_PREC = 1, MP_INT_WITHOUT_PREC, MP_FLOAT } fmt_type;
+	enum { MP_NONE = 0, MP_INT_WITH_PREC = 1, MP_INT_WITHOUT_PREC, MP_FLOAT } fmt_type;
 
 	static const char sp[] = " ";
 	static const char zero_string[] = "0";
@@ -812,7 +817,7 @@ format_tree(
 		mf = NULL;
 		zi = NULL;
 #endif
-		fmt_type = 0;
+		fmt_type = MP_NONE;
 
 		lj = alt = big_flag = bigbig_flag = small_flag = false;
 		fill = sp;
@@ -989,9 +994,7 @@ check_pos:
 			goto check_pos;
 		case '\'':
 #if defined(HAVE_LOCALE_H)       
-			/* allow quote_flag if there is a thousands separator. */
-			if (loc.thousands_sep[0] != '\0')
-				quote_flag = true;
+			quote_flag = true;
 			goto check_pos;
 #else
 			goto retry;  
@@ -1191,6 +1194,9 @@ out0:
 			}
 			if (i < 1)
 				goto out_of_range;
+#if defined(HAVE_LOCALE_H)
+			quote_flag = (quote_flag && loc.thousands_sep[0] != 0);
+#endif
 			chp = &cpbufs[1].buf[i-1];
 			ii = jj = 0;
 			do {
@@ -1198,8 +1204,14 @@ out0:
 				chp--; i--;
 #if defined(HAVE_LOCALE_H)
 				if (quote_flag && loc.grouping[ii] && ++jj == loc.grouping[ii]) {
-					if (i)	/* only add if more digits coming */
-						PREPEND(loc.thousands_sep[0]);	/* XXX - assumption it's one char */
+					if (i) {	/* only add if more digits coming */
+						int k;
+						const char *ts = loc.thousands_sep;
+
+						for (k = strlen(ts) - 1; k >= 0; k--) {
+							PREPEND(ts[k]);
+						}
+					}
 					if (loc.grouping[ii+1] == 0)
 						jj = 0;		/* keep using current val in loc.grouping[ii] */
 					else if (loc.grouping[ii+1] == CHAR_MAX)
@@ -1355,6 +1367,9 @@ mpf1:
 #ifdef HAVE_MPFR
 	int0:
 #endif
+#if defined(HAVE_LOCALE_H)
+			quote_flag = (quote_flag && loc.thousands_sep[0] != 0);
+#endif
 			/*
 			 * When to fill with zeroes is of course not simple.
 			 * First: No zero fill if left-justifying.
@@ -1373,8 +1388,14 @@ mpf1:
 				uval /= base;
 #if defined(HAVE_LOCALE_H)
 				if (base == 10 && quote_flag && loc.grouping[ii] && ++jj == loc.grouping[ii]) {
-					if (uval)	/* only add if more digits coming */
-						PREPEND(loc.thousands_sep[0]);	/* XXX --- assumption it's one char */
+					if (uval) {	/* only add if more digits coming */
+						int k;
+						const char *ts = loc.thousands_sep;
+
+						for (k = strlen(ts) - 1; k >= 0; k--) {
+							PREPEND(ts[k]);
+						}
+					}
 					if (loc.grouping[ii+1] == 0)                                          
 						jj = 0;     /* keep using current val in loc.grouping[ii] */
 					else if (loc.grouping[ii+1] == CHAR_MAX)                        
@@ -1994,10 +2015,10 @@ do_mktime(int nargs)
 			& hour, & minute, & second,
 		        & dst);
 
-	if (do_lint /* Ready? Set! Go: */
-		&& (    (second < 0 || second > 60)
-		|| (minute < 0 || minute > 60)
-		|| (hour < 0 || hour > 23)
+	if (   do_lint /* Ready? Set! Go: */
+	    && (   (second < 0 || second > 60)
+		|| (minute < 0 || minute > 59)
+		|| (hour < 0 || hour > 23) /* FIXME ISO 8601 allows 24 ? */
 		|| (day < 1 || day > 31)
 		|| (month < 1 || month > 12) ))
 			lintwarn(_("mktime: at least one of the values is out of the default range"));
@@ -2159,7 +2180,7 @@ do_print_rec(int nargs, int redirtype)
 
 	f0 = fields_arr[0];
 
-	if (do_lint && f0 == Nnull_string)
+	if (do_lint && (f0->flags & NULL_FIELD) != 0)
 		lintwarn(_("reference to uninitialized field `$%d'"), 0);
 
 	efwrite(f0->stptr, sizeof(char), f0->stlen, fp, "print", rp, false);
@@ -2372,6 +2393,8 @@ static char *const state = (char *const) istate;
 NODE *
 do_rand(int nargs ATTRIBUTE_UNUSED)
 {
+	double tmprand;
+#define RAND_DIVISOR ((double)GAWK_RANDOM_MAX+1.0)
 	if (firstrand) {
 		(void) initstate((unsigned) 1, state, SIZEOF_STATE);
 		/* don't need to srandom(1), initstate() does it for us. */
@@ -2383,7 +2406,60 @@ do_rand(int nargs ATTRIBUTE_UNUSED)
 	 *
 	 * 	0 <= n < 1
 	 */
-	return make_number((AWKNUM) (random() % GAWK_RANDOM_MAX) / GAWK_RANDOM_MAX);
+ 	/*
+	 * Date: Wed, 28 Aug 2013 17:52:46 -0700
+	 * From: Bob Jewett <jewett@bill.scs.agilent.com>
+	 *
+ 	 * Call random() twice to fill in more bits in the value
+ 	 * of the double.  Also, there is a bug in random() such
+ 	 * that when the values of successive values are combined
+ 	 * like (rand1*rand2)^2, (rand3*rand4)^2,  ...  the
+ 	 * resulting time series is not white noise.  The
+ 	 * following also seems to fix that bug. 
+ 	 *
+ 	 * The add/subtract 0.5 keeps small bits from filling
+ 	 * below 2^-53 in the double, not that anyone should be
+ 	 * looking down there. 
+	 *
+	 * Date: Wed, 25 Sep 2013 10:45:38 -0600 (MDT)
+	 * From: "Nelson H. F. Beebe" <beebe@math.utah.edu>
+	 * (4) The code is typical of many published fragments for converting
+	 *     from integer to floating-point, and I discuss the serious pitfalls
+	 *     in my book, because it leads to platform-dependent behavior at the
+	 *     end points of the interval [0,1]
+	 * 
+	 * (5) the documentation in the gawk info node says
+	 * 
+	 *     `rand()'
+	 * 	 Return a random number.  The values of `rand()' are uniformly
+	 * 	 distributed between zero and one.  The value could be zero but is
+	 * 	 never one.(1)
+	 * 
+	 *     The division by RAND_DIVISOR may not guarantee that 1.0 is never
+	 *     returned: the programmer forgot the platform-dependent issue of
+	 *     rounding.
+	 * 
+	 * For points 4 and 5, the safe way is a loop:
+	 * 
+	 *         double 
+	 * 	   rand(void)		// return value in [0.0, 1.0)
+	 *         {
+	 * 	    value = internal_rand();
+	 *
+	 * 	    while (value == 1.0) 
+	 *                 value = internal_rand();
+	 * 
+	 * 	    return (value);
+	 *         }
+ 	 */
+ 
+	do {
+	 	tmprand = 0.5 + ( (random()/RAND_DIVISOR + random())
+					/ RAND_DIVISOR);
+		tmprand -= 0.5;
+	} while (tmprand == 1.0);
+
+ 	return make_number((AWKNUM) tmprand);
 }
 
 /* do_srand --- seed the random number generator */
@@ -2955,13 +3031,16 @@ set_how_many:
 done:
 	DEREF(s);
 
-	if ((matches == 0 || (flags & LITERAL) != 0) && buf != NULL)
+	if ((matches == 0 || (flags & LITERAL) != 0) && buf != NULL) {
 		efree(buf); 
+		buf = NULL;
+	}
 
 	if (flags & GENSUB) {
 		if (matches > 0) {
 			/* return the result string */
 			DEREF(t);
+			assert(buf != NULL);
 			return make_str_node(buf, textlen, ALREADY_MALLOCED);	
 		}