From be08dda3d645a887f7083b9e016d16ecf1b52780 Mon Sep 17 00:00:00 2001
From: corinna <corinna>
Date: Tue, 3 May 2011 10:34:25 +0000
Subject: [PATCH] 	* locale.cc (print_locale_with_codeset): Align
 printing of locale names 	to POSIX.

---
 winsup/utils/ChangeLog | 5 +++++
 winsup/utils/locale.cc | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 9337fcb67a..797a1eff0b 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -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>
 
 	* setfacl.c (getaclentry): Allow extra colon in mask and other entries.
diff --git a/winsup/utils/locale.cc b/winsup/utils/locale.cc
index d6d1064a72..30568f6382 100644
--- a/winsup/utils/locale.cc
+++ b/winsup/utils/locale.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Corinna Vinschen
+ * Copyright (c) 2010, 2011 Corinna Vinschen
  * All rights reserved.
  *
  * 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 ?: "");
   if (verbose)
     fputs ("locale: ", stdout);
-  printf ("%-15s ", locname);
   if (verbose)
     {
+      printf ("%-15s ", locname);
       printf ("archive: %s\n",
       locale->alias ? LOCALE_ALIAS : sysroot);
       puts ("-------------------------------------------------------------------------------");
       printf (" language | %ls\n", locale->language);
       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
-- 
2.11.0