Imported Upstream version 0.9.3upstream/0.9.3

72 files changed, 156 insertions, 89 deletions

diff --git a/lib/unistdio/u-asnprintf.h b/lib/unistdio/u-asnprintf.h
index 8fd08d7f..693e35eb 100644
--- a/lib/unistdio/u-asnprintf.h
+++ b/lib/unistdio/u-asnprintf.h
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-asprintf.h b/lib/unistdio/u-asprintf.h
index ba82faba..b7f5cb29 100644
--- a/lib/unistdio/u-asprintf.h
+++ b/lib/unistdio/u-asprintf.h
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-printf-args.c b/lib/unistdio/u-printf-args.c
index 22fbc088..b357f3c0 100644
--- a/lib/unistdio/u-printf-args.c
+++ b/lib/unistdio/u-printf-args.c
@@ -1,5 +1,6 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-printf-args.h b/lib/unistdio/u-printf-args.h
index 7b2255a2..4e099fc9 100644
--- a/lib/unistdio/u-printf-args.h
+++ b/lib/unistdio/u-printf-args.h
@@ -1,5 +1,6 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-printf-parse.h b/lib/unistdio/u-printf-parse.h
index 11a953f9..0f593f82 100644
--- a/lib/unistdio/u-printf-parse.h
+++ b/lib/unistdio/u-printf-parse.h
@@ -1,5 +1,6 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005, 2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-snprintf.h b/lib/unistdio/u-snprintf.h
index 1665bc23..391709ba 100644
--- a/lib/unistdio/u-snprintf.h
+++ b/lib/unistdio/u-snprintf.h
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-sprintf.h b/lib/unistdio/u-sprintf.h
index 8a1b5544..94f3c820 100644
--- a/lib/unistdio/u-sprintf.h
+++ b/lib/unistdio/u-sprintf.h
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-vasprintf.h b/lib/unistdio/u-vasprintf.h
index 965bfbf5..e67c4cba 100644
--- a/lib/unistdio/u-vasprintf.h
+++ b/lib/unistdio/u-vasprintf.h
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u-vsnprintf.h b/lib/unistdio/u-vsnprintf.h
index 481a22f0..2b2e0d57 100644
--- a/lib/unistdio/u-vsnprintf.h
+++ b/lib/unistdio/u-vsnprintf.h
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -31,13 +31,13 @@ VSNPRINTF (DCHAR_T *buf, size_t size, const FCHAR_T *format, va_list args)
   if (result != buf)
     {
       if (size != 0)
-	{
-	  /* The result did not fit into the buffer.  Copy the initial segment
-	     into the buffer, truncating it if necessary.  */
-	  size_t n = (length < size ? length : size - 1);
-	  DCHAR_CPY (buf, result, n);
-	  buf[n] = '\0';
-	}
+        {
+          /* The result did not fit into the buffer.  Copy the initial segment
+             into the buffer, truncating it if necessary.  */
+          size_t n = (length < size ? length : size - 1);
+          DCHAR_CPY (buf, result, n);
+          buf[n] = '\0';
+        }
       free (result);
     }
 
diff --git a/lib/unistdio/u-vsprintf.h b/lib/unistdio/u-vsprintf.h
index 36ebd9fa..0caf0736 100644
--- a/lib/unistdio/u-vsprintf.h
+++ b/lib/unistdio/u-vsprintf.h
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-asnprintf.c b/lib/unistdio/u16-asnprintf.c
index bbe4bacb..0705dd9e 100644
--- a/lib/unistdio/u16-asnprintf.c
+++ b/lib/unistdio/u16-asnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-asprintf.c b/lib/unistdio/u16-asprintf.c
index 79f3969c..f7710bb8 100644
--- a/lib/unistdio/u16-asprintf.c
+++ b/lib/unistdio/u16-asprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-printf-parse.c b/lib/unistdio/u16-printf-parse.c
index 3a8acd32..fbc10831 100644
--- a/lib/unistdio/u16-printf-parse.c
+++ b/lib/unistdio/u16-printf-parse.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-snprintf.c b/lib/unistdio/u16-snprintf.c
index afed8a7e..c2b99a07 100644
--- a/lib/unistdio/u16-snprintf.c
+++ b/lib/unistdio/u16-snprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-sprintf.c b/lib/unistdio/u16-sprintf.c
index 48603652..b0e0799d 100644
--- a/lib/unistdio/u16-sprintf.c
+++ b/lib/unistdio/u16-sprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-asnprintf.c b/lib/unistdio/u16-u16-asnprintf.c
index 64c257c2..bfb184ae 100644
--- a/lib/unistdio/u16-u16-asnprintf.c
+++ b/lib/unistdio/u16-u16-asnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-asprintf.c b/lib/unistdio/u16-u16-asprintf.c
index 38469c6e..84f1d665 100644
--- a/lib/unistdio/u16-u16-asprintf.c
+++ b/lib/unistdio/u16-u16-asprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-snprintf.c b/lib/unistdio/u16-u16-snprintf.c
index 7229add1..d1642e9e 100644
--- a/lib/unistdio/u16-u16-snprintf.c
+++ b/lib/unistdio/u16-u16-snprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-sprintf.c b/lib/unistdio/u16-u16-sprintf.c
index 1c517c36..58043672 100644
--- a/lib/unistdio/u16-u16-sprintf.c
+++ b/lib/unistdio/u16-u16-sprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-vasnprintf.c b/lib/unistdio/u16-u16-vasnprintf.c
index e33851e2..5c356bf8 100644
--- a/lib/unistdio/u16-u16-vasnprintf.c
+++ b/lib/unistdio/u16-u16-vasnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to UTF-16 strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-vasprintf.c b/lib/unistdio/u16-u16-vasprintf.c
index 3d8fc508..6202a8bf 100644
--- a/lib/unistdio/u16-u16-vasprintf.c
+++ b/lib/unistdio/u16-u16-vasprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-vsnprintf.c b/lib/unistdio/u16-u16-vsnprintf.c
index 6bbf8251..2bf5c0ea 100644
--- a/lib/unistdio/u16-u16-vsnprintf.c
+++ b/lib/unistdio/u16-u16-vsnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-u16-vsprintf.c b/lib/unistdio/u16-u16-vsprintf.c
index 1a7e93c2..b87f17e5 100644
--- a/lib/unistdio/u16-u16-vsprintf.c
+++ b/lib/unistdio/u16-u16-vsprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-vasnprintf.c b/lib/unistdio/u16-vasnprintf.c
index 3ce19d42..05d0adfc 100644
--- a/lib/unistdio/u16-vasnprintf.c
+++ b/lib/unistdio/u16-vasnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to UTF-16 strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-vasprintf.c b/lib/unistdio/u16-vasprintf.c
index b63dd183..f917f68f 100644
--- a/lib/unistdio/u16-vasprintf.c
+++ b/lib/unistdio/u16-vasprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-vsnprintf.c b/lib/unistdio/u16-vsnprintf.c
index b06ca094..0b8bfce5 100644
--- a/lib/unistdio/u16-vsnprintf.c
+++ b/lib/unistdio/u16-vsnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u16-vsprintf.c b/lib/unistdio/u16-vsprintf.c
index 4811bc15..7026a689 100644
--- a/lib/unistdio/u16-vsprintf.c
+++ b/lib/unistdio/u16-vsprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-asnprintf.c b/lib/unistdio/u32-asnprintf.c
index dad1ae49..c4eefd6b 100644
--- a/lib/unistdio/u32-asnprintf.c
+++ b/lib/unistdio/u32-asnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-asprintf.c b/lib/unistdio/u32-asprintf.c
index 11e23f01..67730320 100644
--- a/lib/unistdio/u32-asprintf.c
+++ b/lib/unistdio/u32-asprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-printf-parse.c b/lib/unistdio/u32-printf-parse.c
index a5772566..bc3c7f25 100644
--- a/lib/unistdio/u32-printf-parse.c
+++ b/lib/unistdio/u32-printf-parse.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-snprintf.c b/lib/unistdio/u32-snprintf.c
index 7d670171..0636eef4 100644
--- a/lib/unistdio/u32-snprintf.c
+++ b/lib/unistdio/u32-snprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-sprintf.c b/lib/unistdio/u32-sprintf.c
index 6f930d09..207078bc 100644
--- a/lib/unistdio/u32-sprintf.c
+++ b/lib/unistdio/u32-sprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-asnprintf.c b/lib/unistdio/u32-u32-asnprintf.c
index b3a02745..bd37c808 100644
--- a/lib/unistdio/u32-u32-asnprintf.c
+++ b/lib/unistdio/u32-u32-asnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-asprintf.c b/lib/unistdio/u32-u32-asprintf.c
index 91a96fc4..edc16e70 100644
--- a/lib/unistdio/u32-u32-asprintf.c
+++ b/lib/unistdio/u32-u32-asprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-snprintf.c b/lib/unistdio/u32-u32-snprintf.c
index cf88529c..a36c1239 100644
--- a/lib/unistdio/u32-u32-snprintf.c
+++ b/lib/unistdio/u32-u32-snprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-sprintf.c b/lib/unistdio/u32-u32-sprintf.c
index ccf6d028..eb322fc9 100644
--- a/lib/unistdio/u32-u32-sprintf.c
+++ b/lib/unistdio/u32-u32-sprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-vasnprintf.c b/lib/unistdio/u32-u32-vasnprintf.c
index b272af33..17ae282c 100644
--- a/lib/unistdio/u32-u32-vasnprintf.c
+++ b/lib/unistdio/u32-u32-vasnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to UTF-32 strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-vasprintf.c b/lib/unistdio/u32-u32-vasprintf.c
index bacc7c1b..678e2fd9 100644
--- a/lib/unistdio/u32-u32-vasprintf.c
+++ b/lib/unistdio/u32-u32-vasprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-vsnprintf.c b/lib/unistdio/u32-u32-vsnprintf.c
index 7f436236..c42678b7 100644
--- a/lib/unistdio/u32-u32-vsnprintf.c
+++ b/lib/unistdio/u32-u32-vsnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-u32-vsprintf.c b/lib/unistdio/u32-u32-vsprintf.c
index 46d299ac..6a185987 100644
--- a/lib/unistdio/u32-u32-vsprintf.c
+++ b/lib/unistdio/u32-u32-vsprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-vasnprintf.c b/lib/unistdio/u32-vasnprintf.c
index 6aac6235..86a3564a 100644
--- a/lib/unistdio/u32-vasnprintf.c
+++ b/lib/unistdio/u32-vasnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to UTF-32 strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-vasprintf.c b/lib/unistdio/u32-vasprintf.c
index e6883e31..ef4ed97d 100644
--- a/lib/unistdio/u32-vasprintf.c
+++ b/lib/unistdio/u32-vasprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-vsnprintf.c b/lib/unistdio/u32-vsnprintf.c
index a55e1c76..ba47a3c5 100644
--- a/lib/unistdio/u32-vsnprintf.c
+++ b/lib/unistdio/u32-vsnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u32-vsprintf.c b/lib/unistdio/u32-vsprintf.c
index a850e45f..26b1e959 100644
--- a/lib/unistdio/u32-vsprintf.c
+++ b/lib/unistdio/u32-vsprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-asnprintf.c b/lib/unistdio/u8-asnprintf.c
index b8e7a276..839e6e24 100644
--- a/lib/unistdio/u8-asnprintf.c
+++ b/lib/unistdio/u8-asnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-asprintf.c b/lib/unistdio/u8-asprintf.c
index 22b01705..8004b964 100644
--- a/lib/unistdio/u8-asprintf.c
+++ b/lib/unistdio/u8-asprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-printf-parse.c b/lib/unistdio/u8-printf-parse.c
index a3555481..6b872991 100644
--- a/lib/unistdio/u8-printf-parse.c
+++ b/lib/unistdio/u8-printf-parse.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-snprintf.c b/lib/unistdio/u8-snprintf.c
index 87290541..ce0f7dec 100644
--- a/lib/unistdio/u8-snprintf.c
+++ b/lib/unistdio/u8-snprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-sprintf.c b/lib/unistdio/u8-sprintf.c
index 330feaee..2467fbb3 100644
--- a/lib/unistdio/u8-sprintf.c
+++ b/lib/unistdio/u8-sprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-asnprintf.c b/lib/unistdio/u8-u8-asnprintf.c
index 9379c72a..cdcd6c8f 100644
--- a/lib/unistdio/u8-u8-asnprintf.c
+++ b/lib/unistdio/u8-u8-asnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-asprintf.c b/lib/unistdio/u8-u8-asprintf.c
index 59745278..8e34f3d9 100644
--- a/lib/unistdio/u8-u8-asprintf.c
+++ b/lib/unistdio/u8-u8-asprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-snprintf.c b/lib/unistdio/u8-u8-snprintf.c
index 26dfac0e..615c5cbd 100644
--- a/lib/unistdio/u8-u8-snprintf.c
+++ b/lib/unistdio/u8-u8-snprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-sprintf.c b/lib/unistdio/u8-u8-sprintf.c
index 53b3c96b..57c5642e 100644
--- a/lib/unistdio/u8-u8-sprintf.c
+++ b/lib/unistdio/u8-u8-sprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-vasnprintf.c b/lib/unistdio/u8-u8-vasnprintf.c
index 7535d4ca..588947da 100644
--- a/lib/unistdio/u8-u8-vasnprintf.c
+++ b/lib/unistdio/u8-u8-vasnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to UTF-8 strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-vasprintf.c b/lib/unistdio/u8-u8-vasprintf.c
index bb28dc5f..6a3732d0 100644
--- a/lib/unistdio/u8-u8-vasprintf.c
+++ b/lib/unistdio/u8-u8-vasprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-vsnprintf.c b/lib/unistdio/u8-u8-vsnprintf.c
index f9e99223..2ebb19ae 100644
--- a/lib/unistdio/u8-u8-vsnprintf.c
+++ b/lib/unistdio/u8-u8-vsnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-u8-vsprintf.c b/lib/unistdio/u8-u8-vsprintf.c
index 9e66018a..ca4c656e 100644
--- a/lib/unistdio/u8-u8-vsprintf.c
+++ b/lib/unistdio/u8-u8-vsprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-vasnprintf.c b/lib/unistdio/u8-vasnprintf.c
index 0067e6ce..304c54c5 100644
--- a/lib/unistdio/u8-vasnprintf.c
+++ b/lib/unistdio/u8-vasnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to UTF-8 strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-vasprintf.c b/lib/unistdio/u8-vasprintf.c
index 304d4965..5b7f719d 100644
--- a/lib/unistdio/u8-vasprintf.c
+++ b/lib/unistdio/u8-vasprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-vsnprintf.c b/lib/unistdio/u8-vsnprintf.c
index 87388e29..4f6f1fa7 100644
--- a/lib/unistdio/u8-vsnprintf.c
+++ b/lib/unistdio/u8-vsnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/u8-vsprintf.c b/lib/unistdio/u8-vsprintf.c
index aa0b52d2..7397d289 100644
--- a/lib/unistdio/u8-vsprintf.c
+++ b/lib/unistdio/u8-vsprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-asnprintf.c b/lib/unistdio/ulc-asnprintf.c
index 31d3f220..5a79c8ca 100644
--- a/lib/unistdio/ulc-asnprintf.c
+++ b/lib/unistdio/ulc-asnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-asprintf.c b/lib/unistdio/ulc-asprintf.c
index 4f760e1d..a97a3fef 100644
--- a/lib/unistdio/ulc-asprintf.c
+++ b/lib/unistdio/ulc-asprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-fprintf.c b/lib/unistdio/ulc-fprintf.c
index ac8ab6fe..fb2b9e25 100644
--- a/lib/unistdio/ulc-fprintf.c
+++ b/lib/unistdio/ulc-fprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -55,11 +55,11 @@ ulc_fprintf (FILE *fp, const char *format, ...)
   if (fwrite (output, 1, len, fp) < len)
     {
       if (output != buf)
-	{
-	  int saved_errno = errno;
-	  free (output);
-	  errno = saved_errno;
-	}
+        {
+          int saved_errno = errno;
+          free (output);
+          errno = saved_errno;
+        }
       return -1;
     }
 
diff --git a/lib/unistdio/ulc-printf-parse.c b/lib/unistdio/ulc-printf-parse.c
index 81af3690..a2e22b2a 100644
--- a/lib/unistdio/ulc-printf-parse.c
+++ b/lib/unistdio/ulc-printf-parse.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-snprintf.c b/lib/unistdio/ulc-snprintf.c
index f774ac04..9b57ada7 100644
--- a/lib/unistdio/ulc-snprintf.c
+++ b/lib/unistdio/ulc-snprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-sprintf.c b/lib/unistdio/ulc-sprintf.c
index 466ffb40..a9f3c4ea 100644
--- a/lib/unistdio/ulc-sprintf.c
+++ b/lib/unistdio/ulc-sprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-vasnprintf.c b/lib/unistdio/ulc-vasnprintf.c
index e89b7fff..ef652b99 100644
--- a/lib/unistdio/ulc-vasnprintf.c
+++ b/lib/unistdio/ulc-vasnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-vasprintf.c b/lib/unistdio/ulc-vasprintf.c
index 8773ab46..24c77238 100644
--- a/lib/unistdio/ulc-vasprintf.c
+++ b/lib/unistdio/ulc-vasprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-vfprintf.c b/lib/unistdio/ulc-vfprintf.c
index 586fe13a..d7140108 100644
--- a/lib/unistdio/ulc-vfprintf.c
+++ b/lib/unistdio/ulc-vfprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -52,11 +52,11 @@ ulc_vfprintf (FILE *fp, const char *format, va_list args)
   if (fwrite (output, 1, len, fp) < len)
     {
       if (output != buf)
-	{
-	  int saved_errno = errno;
-	  free (output);
-	  errno = saved_errno;
-	}
+        {
+          int saved_errno = errno;
+          free (output);
+          errno = saved_errno;
+        }
       return -1;
     }
 
diff --git a/lib/unistdio/ulc-vsnprintf.c b/lib/unistdio/ulc-vsnprintf.c
index c1665359..7a43eb27 100644
--- a/lib/unistdio/ulc-vsnprintf.c
+++ b/lib/unistdio/ulc-vsnprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/unistdio/ulc-vsprintf.c b/lib/unistdio/ulc-vsprintf.c
index 0cccc05d..9b19a331 100644
--- a/lib/unistdio/ulc-vsprintf.c
+++ b/lib/unistdio/ulc-vsprintf.c
@@ -1,5 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published