stdio/FreeBSD/vsnprintf.c.patch

   1 --- vsnprintf.c.orig    2009-11-30 16:15:30.000000000 -0800
   2 +++ vsnprintf.c 2009-12-03 15:20:43.000000000 -0800
   3 @@ -36,19 +36,25 @@ static char sccsid[] = "@(#)vsnprintf.c
   4  #include <sys/cdefs.h>
   5  __FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.24 2008/04/17 22:17:54 jhb Exp $");
   6
   7 +#include "xlocale_private.h"
   8 +
   9  #include <limits.h>
  10  #include <stdio.h>
  11  #include "local.h"
  12
  13  int
  14 -vsnprintf(char * __restrict str, size_t n, const char * __restrict fmt,
  15 +vsnprintf_l(char * __restrict str, size_t n, locale_t loc, const char * __restrict fmt,
  16      __va_list ap)
  17  {
  18         size_t on;
  19         int ret;
  20         char dummy[2];
  21         FILE f;
  22 +       struct __sFILEX ext;
  23 +       f._extra = &ext;
  24 +       INITEXTRA(&f);
  25
  26 +       NORMALIZE_LOCALE(loc);
  27         on = n;
  28         if (n != 0)
  29                 n--;
  30 @@ -67,8 +73,15 @@ vsnprintf(char * __restrict str, size_t
  31         f._bf._size = f._w = n;
  32         f._orientation = 0;
  33         memset(&f._mbstate, 0, sizeof(mbstate_t));
  34 -       ret = __vfprintf(&f, fmt, ap);
  35 +       ret = __vfprintf(&f, loc, fmt, ap);
  36         if (on > 0)
  37                 *f._p = '\0';
  38         return (ret);
  39  }
  40 +
  41 +int
  42 +vsnprintf(char * __restrict str, size_t n, const char * __restrict fmt,
  43 +    __va_list ap)
  44 +{
  45 +       return vsnprintf_l(str, n, __current_locale(), fmt, ap);
  46 +}