Skip to content

Commit

Permalink
Add setlocale() call (fix #1740)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicowilliams committed Sep 6, 2023
1 parent ac3b70d commit 11c528d
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define
[], [[#include <time.h>]])
AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])],
[], [[#include <time.h>]])
AC_FIND_FUNC([setlocale], [c], [#include <locale.h>], [0,0])

dnl Figure out if we have the pthread functions we actually need
AC_FIND_FUNC_NO_LIBS([pthread_key_create], [], [#include <pthread.h>], [NULL, NULL])
Expand Down
7 changes: 7 additions & 0 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#include <ctype.h>
#include <errno.h>
#include <libgen.h>
#ifdef HAVE_SETLOCALE
#include <locale.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
Expand Down Expand Up @@ -319,6 +322,10 @@ int main(int argc, char* argv[]) {
jv ARGS = jv_array(); /* positional arguments */
jv program_arguments = jv_object(); /* named arguments */

#ifdef HAVE_SETLOCALE
(void) setlocale(LC_ALL, "");
#endif

#ifdef WIN32
jv_tsd_dtoa_ctx_init();
fflush(stdout);
Expand Down
28 changes: 23 additions & 5 deletions tests/shtest
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

. "${0%/*}/setup" "$@"

msys=false
mingw=false
case "$(uname -s)" in
MSYS*) msys=true;;
MINGW*) mingw=true;;
esac

JQ_NO_B=$JQ
JQ="$JQ -b"

Expand Down Expand Up @@ -496,11 +503,9 @@ cmp $d/color $d/expect
cmp $d/warning $d/expect_warning

# Check $NO_COLOR
case "$(uname -s)" in
MSYS*) test_no_color=false;;
MINGW*) test_no_color=false;;
*) test_no_color=true;;
esac
test_no_color=true
$msys && test_no_color=false
$mingw && test_no_color=false
if $test_no_color && command -v script >/dev/null 2>&1; then
unset NO_COLOR
if script -qc echo /dev/null >/dev/null 2>&1; then
Expand Down Expand Up @@ -561,4 +566,17 @@ if ! $VALGRIND $Q $JQ -n -f "$JQTESTDIR/yes-main-program.jq" > $d/out 2>&1; then
exit 1
fi

if ( ! $msys && ! $mingw ) && locale -a > /dev/null; then
locale=$(locale -a | egrep -v '^(C|LANG|POSIX|en)' | egrep -i 'utf8|utf-8' | head -1)
if [ -z "$locale" ]; then
echo "WARNING: Not testing localization"
else
date=$(LC_ALL="$locale" date +"%a %d %b %Y at %H:%M:%S")
if ! LC_ALL="$locale" ./jq -nRe --arg date "$date" '$date|strptime("%a %d %b %Y at %H:%M:%S")? // false'; then
echo "jq does not honor LC_ALL environment variable"
exit 1;
fi
fi
fi

exit 0

0 comments on commit 11c528d

Please sign in to comment.