[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 058c012: Only set LANG if the ID is valid
From: |
Alan Third |
Subject: |
master 058c012: Only set LANG if the ID is valid |
Date: |
Tue, 16 Nov 2021 15:52:25 -0500 (EST) |
branch: master
commit 058c012f73d4abe014ace44b46c23babd48aebbc
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Only set LANG if the ID is valid
* src/nsterm.m (ns_init_locale): Check the provided locale identifier
is available before trying to use it.
---
src/nsterm.m | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 1f17a30..e29dda6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -535,8 +535,11 @@ ns_init_locale (void)
NSTRACE ("ns_init_locale");
- @try
+ /* If we were run from a terminal then assume an unset LANG variable
+ is intentional and don't try to "fix" it. */
+ if (!isatty (STDIN_FILENO))
{
+ char *oldLocale = setlocale (LC_ALL, NULL);
/* It seems macOS should probably use UTF-8 everywhere.
'localeIdentifier' does not specify the encoding, and I can't
find any way to get the OS to tell us which encoding to use,
@@ -544,12 +547,12 @@ ns_init_locale (void)
NSString *localeID = [NSString stringWithFormat:@"%@.UTF-8",
[locale localeIdentifier]];
- /* Set LANG to locale, but not if LANG is already set. */
- setenv("LANG", [localeID UTF8String], 0);
- }
- @catch (NSException *e)
- {
- NSLog (@"Locale detection failed: %@: %@", [e name], [e reason]);
+ /* Check the locale ID is valid and if so set LANG, but not if
+ it is already set. */
+ if (setlocale (LC_ALL, [localeID UTF8String]))
+ setenv("LANG", [localeID UTF8String], 0);
+
+ setlocale (LC_ALL, oldLocale);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 058c012: Only set LANG if the ID is valid,
Alan Third <=