Author: dteske
Date: Thu Jan 14 01:59:20 2016
New Revision: 293868
URL: https://svnweb.freebsd.org/changeset/base/293868
Log:
Default to en_US.ISO8859-1 if no locale
MFC after: 3 days
X-MFC-to: stable/10
Modified:
head/lib/libdpv/dpv.c
head/lib/libdpv/dpv.h
Modified: head/lib/libdpv/dpv.c
==============================================================================
--- head/lib/libdpv/dpv.c Thu Jan 14 01:51:18 2016 (r293867)
+++ head/lib/libdpv/dpv.c Thu Jan 14 01:59:20 2016 (r293868)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
#include <dialog.h>
#include <err.h>
#include <limits.h>
+#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -482,6 +483,11 @@ dpv(struct dpv_config *config, struct dp
/* Reads: label_size pbar_size pprompt aprompt dpv_nfiles */
/* Inits: dheight and dwidth */
+ /* Default localeconv(3) settings for dialog(3) status */
+ setlocale(LC_NUMERIC,
+ getenv("LC_ALL") == NULL && getenv("LC_NUMERIC") == NULL ?
+ LC_NUMERIC_DEFAULT : "");
+
if (!debug) {
/* Internally create the initial `--gauge' prompt text */
dprompt_recreate(file_list, (struct dpv_file_node *)NULL, 0);
Modified: head/lib/libdpv/dpv.h
==============================================================================
--- head/lib/libdpv/dpv.h Thu Jan 14 01:51:18 2016 (r293867)
+++ head/lib/libdpv/dpv.h Thu Jan 14 01:59:20 2016 (r293868)
@@ -38,6 +38,9 @@
#define FALSE 0
#endif
+/* localeconv(3) */
+#define LC_NUMERIC_DEFAULT "en_US.ISO8859-1"
+
/* Data to process */
extern long long dpv_overall_read;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
