drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* locale.cc (print_locale_with_codeset): Align printing of locale names 

to POSIX.
This commit is contained in:
Corinna Vinschen 2011-05-03 10:34:25 +00:00
parent c402095aae
commit 3728c79d48
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-03 Corinna Vinschen <corinna@vinschen.de>
* locale.cc (print_locale_with_codeset): Align printing of locale names
to POSIX.
2011-04-18 Corinna Vinschen <corinna@vinschen.de> 2011-04-18 Corinna Vinschen <corinna@vinschen.de>
* setfacl.c (getaclentry): Allow extra colon in mask and other entries. * setfacl.c (getaclentry): Allow extra colon in mask and other entries.

9
winsup/utils/locale.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, Corinna Vinschen * Copyright (c) 2010, 2011 Corinna Vinschen
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -137,17 +137,18 @@ print_locale_with_codeset (int verbose, loc_t *locale, bool utf8,
modifier ? "@" : "", modifier ?: ""); modifier ? "@" : "", modifier ?: "");
if (verbose) if (verbose)
fputs ("locale: ", stdout); fputs ("locale: ", stdout);
printf ("%-15s ", locname);
if (verbose) if (verbose)
{ {
printf ("%-15s ", locname);
printf ("archive: %s\n", printf ("archive: %s\n",
locale->alias ? LOCALE_ALIAS : sysroot); locale->alias ? LOCALE_ALIAS : sysroot);
puts ("-------------------------------------------------------------------------------"); puts ("-------------------------------------------------------------------------------");
printf (" language | %ls\n", locale->language); printf (" language | %ls\n", locale->language);
printf ("territory | %ls\n", locale->territory); printf ("territory | %ls\n", locale->territory);
printf (" codeset | %s\n", utf8 ? "UTF-8" : locale->codeset); printf (" codeset | %s\n\n", utf8 ? "UTF-8" : locale->codeset);
} }
putc ('\n', stdout); else
printf ("%s\n", locname);
} }
void void