From: Jim Meyering Date: Sat, 5 Aug 2000 20:27:49 +0000 (+0000) Subject: (main): Rename local `t' to `tmp_dir' to avoid shadowing X-Git-Tag: TEXTUTILS-2_0g~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=773a575cd59826669a84dc56663a0c7882d47628;p=thirdparty%2Fcoreutils.git (main): Rename local `t' to `tmp_dir' to avoid shadowing a previous local by that name. (usage): Warn that GNU sort is now locale-aware, and suggest people put LC_ALL=POSIX in their environment. --- diff --git a/src/sort.c b/src/sort.c index c6ffbc4d3f..d31f048092 100644 --- a/src/sort.c +++ b/src/sort.c @@ -310,6 +310,12 @@ in the field, both counted from one with -k, from zero with the obsolescent\n\ form. OPTS is made up of one or more of Mbdfinr; this effectively disables\n\ global -Mbdfinr settings for that key. If no key is given, use the entire\n\ line as the key. With no FILE, or when FILE is -, read standard input.\n\ +\n\ +*** WARNING ***\n\ +This version of sort honors the locale settings in your environment.\n\ +For example, if you set one of the LANG or LC_ALL environment variables\n\ +to `en_US', then sort will work very differently than most people expect.\n\ +If that's not what you want, then set LC_ALL to POSIX in your environment.\n\ ") ); puts (_("\nReport bugs to .")); @@ -2226,8 +2232,8 @@ but lacks following character offset")); if (temp_dir_count == 0) { - char const *t = getenv ("TMPDIR"); - add_temp_dir (t ? t : DEFAULT_TMPDIR); + char const *tmp_dir = getenv ("TMPDIR"); + add_temp_dir (tmp_dir ? tmp_dir : DEFAULT_TMPDIR); } if (nfiles == 0)