github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-24 15:02:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[math] Set LC_NUMERIC to C

Browse Source 
This allows us to always use "." as radix character, so e.g.

    math 2.5 - 2

is always valid, regardless of locale.
This commit is contained in:
Fabian Homborg 2018-02-11 15:44:35 +01:00
parent 234ebb5d7b
commit ce28891c76
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/builtin_math.cpp
View File

@ -120,7 +120,14 @@ static int evaluate_expression(const wchar_t *cmd, parser_t &parser, io_streams_
int error; int error;
char *narrow_str = wcs2str(expression); char *narrow_str = wcs2str(expression);
// Switch locale while computing stuff.
// This means that the "." is always the radix character,
// so numbers work the same across locales.
char *saved_locale = strdup(setlocale(LC_NUMERIC, NULL));
setlocale(LC_NUMERIC, "C");
double v = te_interp(narrow_str, &error); double v = te_interp(narrow_str, &error);
setlocale(LC_NUMERIC, saved_locale);
if (error == 0) { if (error == 0) {
if (opts.scale == 0) { if (opts.scale == 0) {
streams.out.append_format(L"%ld\n", static_cast<long>(v)); streams.out.append_format(L"%ld\n", static_cast<long>(v));
@ -132,6 +139,7 @@ static int evaluate_expression(const wchar_t *cmd, parser_t &parser, io_streams_
streams.err.append_format(L"'%ls': Error at token %d\n", expression.c_str(), error - 1); streams.err.append_format(L"'%ls': Error at token %d\n", expression.c_str(), error - 1);
} }
free(narrow_str); free(narrow_str);
free(saved_locale);
return STATUS_CMD_OK; return STATUS_CMD_OK;
} }