Module Name: src Committed By: yamt Date: Mon Jul 30 23:04:43 UTC 2012
Modified Files: src/lib/libintl: gettext.c Log Message: comments To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libintl/gettext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libintl/gettext.c diff -u src/lib/libintl/gettext.c:1.27 src/lib/libintl/gettext.c:1.28 --- src/lib/libintl/gettext.c:1.27 Wed Mar 21 10:10:36 2012 +++ src/lib/libintl/gettext.c Mon Jul 30 23:04:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: gettext.c,v 1.27 2012/03/21 10:10:36 matt Exp $ */ +/* $NetBSD: gettext.c,v 1.28 2012/07/30 23:04:42 yamt Exp $ */ /*- * Copyright (c) 2000, 2001 Citrus Project, @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: gettext.c,v 1.27 2012/03/21 10:10:36 matt Exp $"); +__RCSID("$NetBSD: gettext.c,v 1.28 2012/07/30 23:04:42 yamt Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -215,6 +215,10 @@ lookup_mofile(char *buf, size_t len, con char *p, *q; char lpath_tmp[BUFSIZ]; + /* + * LANGUAGE is a colon separated list of locale names. + */ + strlcpy(lpath_tmp, lpath, sizeof(lpath_tmp)); q = lpath_tmp; /* CONSTCOND */ @@ -808,12 +812,21 @@ get_lang_env(const char *category_name) { const char *lang; - /* 1. see LANGUAGE variable first. */ + /* + * 1. see LANGUAGE variable first. + * + * LANGUAGE is a GNU extension. + * It's a colon separated list of locale names. + */ lang = getenv("LANGUAGE"); if (lang) return lang; - /* 2. if LANGUAGE isn't set, see LC_ALL, LC_xxx, LANG. */ + /* + * 2. if LANGUAGE isn't set, see LC_ALL, LC_xxx, LANG. + * + * It's essentially setlocale(LC_xxx, NULL). + */ lang = getenv("LC_ALL"); if (!lang) lang = getenv(category_name);