Bug 15968 was fixed by commit 0748546f660d27a2ad29fa6174d456e2f6490758.

[jlayton/glibc.git] / stdio-common / reg-printf.c

diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index 519eec20ac47158012cb4d10b3de5a8a5b468eb1..464707a5254d302ddcfa1aa4d22d59b037e46cc4 100644 (file)
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -1,40 +1,47 @@
-/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <limits.h>
 #include <printf.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <bits/libc-lock.h>
+
 
 /* Array of functions indexed by format character.  */
-static printf_function *printf_funcs[UCHAR_MAX + 1];
-printf_arginfo_function *__printf_arginfo_table[UCHAR_MAX + 1];
+libc_freeres_ptr (printf_arginfo_size_function **__printf_arginfo_table)
+  attribute_hidden;
+printf_function **__printf_function_table attribute_hidden;
+
+__libc_lock_define_initialized (static, lock)
 
-printf_function **__printf_function_table;
+int __register_printf_specifier (int, printf_function,
+                                printf_arginfo_size_function);
+int __register_printf_function (int, printf_function,
+                               printf_arginfo_function);
 
-int __register_printf_function __P ((int, printf_function,
-                                     printf_arginfo_function));
 
 /* Register FUNC to be called to format SPEC specifiers.  */
 int
-__register_printf_function (spec, converter, arginfo)
+__register_printf_specifier (spec, converter, arginfo)
      int spec;
      printf_function converter;
-     printf_arginfo_function arginfo;
+     printf_arginfo_size_function arginfo;
 {
   if (spec < 0 || spec > (int) UCHAR_MAX)
     {
@@ -42,10 +49,42 @@ __register_printf_function (spec, converter, arginfo)
       return -1;
     }
 
-  __printf_function_table = printf_funcs;
+  int result = 0;
+  __libc_lock_lock (lock);
+
+  if (__printf_function_table == NULL)
+    {
+      __printf_arginfo_table = (printf_arginfo_size_function **)
+       calloc (UCHAR_MAX + 1, sizeof (void *) * 2);
+      if (__printf_arginfo_table == NULL)
+       {
+         result = -1;
+         goto out;
+       }
+
+      __printf_function_table = (printf_function **)
+       (__printf_arginfo_table + UCHAR_MAX + 1);
+    }
+
+  __printf_function_table[spec] = converter;
   __printf_arginfo_table[spec] = arginfo;
-  printf_funcs[spec] = converter;
 
-  return 0;
+ out:
+  __libc_lock_unlock (lock);
+
+  return result;
+}
+weak_alias (__register_printf_specifier, register_printf_specifier)
+
+
+/* Register FUNC to be called to format SPEC specifiers.  */
+int
+__register_printf_function (spec, converter, arginfo)
+     int spec;
+     printf_function converter;
+     printf_arginfo_function arginfo;
+{
+  return __register_printf_specifier (spec, converter,
+                                     (printf_arginfo_size_function*) arginfo);
 }
 weak_alias (__register_printf_function, register_printf_function)