* lib/localcharset.c (get_charset_aliases): Add a tautological
UTF-8 entry to speed up the search for this case.
Most machines default to a UTF-8 locale nowadays, so begin the
list of aliases with a dummy UTF-8 entry so it will be found
immediately and a time-consuming search through the rest of
the list is avoided.
---
ChangeLog | 10 ++++++++++
lib/localcharset.c | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index f5752a217..1c6f32294 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-04-21 Benno Schulenberg <bensb...@telfort.nl> (tiny change)
+
+ localcharset: short-circuit the search for an alias on a Mac
+ * lib/localcharset.c (get_charset_aliases): Add a tautological
+ UTF-8 entry to speed up the search for this case.
+ Most machines default to a UTF-8 locale nowadays, so begin the
+ list of aliases with a dummy UTF-8 entry so it will be found
+ immediately and a time-consuming search through the rest of
+ the list is avoided.
+
2018-04-11 Paul Eggert <egg...@cs.ucla.edu>
fts: add comment
diff --git a/lib/localcharset.c b/lib/localcharset.c
index a73d6bdd1..9ea964581 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -263,7 +263,8 @@ get_charset_aliases (void)
/* To avoid the trouble of installing a file that is shared by many
GNU packages -- many packaging systems have problems with this --,
simply inline the aliases here. */
- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+ cp = "UTF-8" "\0" "UTF-8" "\0";
+ "ISO8859-1" "\0" "ISO-8859-1" "\0"
"ISO8859-2" "\0" "ISO-8859-2" "\0"
"ISO8859-4" "\0" "ISO-8859-4" "\0"
"ISO8859-5" "\0" "ISO-8859-5" "\0"
--
2.16.3
