svn commit: r309329 - stable/10/usr.bin/locale

[Eric van Gyzen]

Author: vangyzen
Date: Wed Nov 30 18:11:35 2016
New Revision: 309329
URL: https://svnweb.freebsd.org/changeset/base/309329

Log:
  MFC r308824
  
  locale: fix display of "grouping" and "mon_grouping" values
  
  The "grouping" and "mon_grouping" values are arrays of one-byte
  integers, not arrays of ASCII characters.  Display them in a format
  similar to GNU and MacOS.
  
  Sponsored by:	Dell EMC

Modified:
  stable/10/usr.bin/locale/locale.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/locale/locale.c
==============================================================================
--- stable/10/usr.bin/locale/locale.c	Wed Nov 30 14:18:52 2016	(r309328)
+++ stable/10/usr.bin/locale/locale.c	Wed Nov 30 18:11:35 2016	(r309329)
@@ -38,6 +38,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <err.h>
+#include <limits.h>
 #include <locale.h>
 #include <langinfo.h>
 #include <stdio.h>
@@ -48,6 +49,7 @@
 #include "setlocale.h"
 
 /* Local prototypes */
+char	*format_grouping(const char *);
 void	init_locales_list(void);
 void	list_charmaps(void);
 void	list_locales(void);
@@ -486,6 +488,34 @@ showlocale(void)
 	printf("LC_ALL=%s\n", vval);
 }
 
+char *
+format_grouping(const char *binary)
+{
+	static char rval[64];
+	const char *cp;
+	size_t len;
+
+	rval[0] = '\0';
+	for (cp = binary; *cp != '\0'; ++cp) {
+		char group[sizeof("127;")];
+		snprintf(group, sizeof(group), "%hhd;", *cp);
+		len = strlcat(rval, group, sizeof(rval));
+		if (len >= sizeof(rval)) {
+			len = sizeof(rval) - 1;
+			break;
+		}
+		if (*cp == CHAR_MAX) {
+			break;
+		}
+	}
+
+	/* Remove the trailing ';'. */
+	rval[len - 1] = '\0';
+
+	return (rval);
+}
+
+
 /*
  * keyword value lookup helper (via localeconv())
  */
@@ -499,7 +529,7 @@ kwval_lconv(int id)
 	lc = localeconv();
 	switch (id) {
 		case KW_GROUPING:
-			rval = lc->grouping;
+			rval = format_grouping(lc->grouping);
 			break;
 		case KW_INT_CURR_SYMBOL:
 			rval = lc->int_curr_symbol;
@@ -514,7 +544,7 @@ kwval_lconv(int id)
 			rval = lc->mon_thousands_sep;
 			break;
 		case KW_MON_GROUPING:
-			rval = lc->mon_grouping;
+			rval = format_grouping(lc->mon_grouping);
 			break;
 		case KW_POSITIVE_SIGN:
 			rval = lc->positive_sign;