Libc-1439.100.3.tar.gz

[apple/libc.git] / locale / FreeBSD / wcsftime.c

diff --git a/locale/FreeBSD/wcsftime.c b/locale/FreeBSD/wcsftime.c
index 2598043e644133d007bab9e9e1c1347863a4cbe7..ddf989ac9009b7443f033078fa1b529a0a4c22a9 100644 (file)
--- a/locale/FreeBSD/wcsftime.c
+++ b/locale/FreeBSD/wcsftime.c
@@ -25,7 +25,9 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.6 2009/01/15 20:45:59 rdivacky Exp $");
+
+#include "xlocale_private.h"

 
 #include <errno.h>
 #include <limits.h>
 
 #include <errno.h>
 #include <limits.h>


@@ -47,15 +49,19 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.4 2004/04/07 09:47:56 tjr
  * format specifications in the format string.
  */
 size_t
  * format specifications in the format string.
  */
 size_t

-wcsftime(wchar_t * __restrict wcs, size_t maxsize,
-    const wchar_t * __restrict format, const struct tm * __restrict timeptr)
+wcsftime_l(wchar_t * __restrict wcs, size_t maxsize,
+    const wchar_t * __restrict format, const struct tm * __restrict timeptr,
+    locale_t loc)

 {
        static const mbstate_t initial;
        mbstate_t mbs;
 {
        static const mbstate_t initial;
        mbstate_t mbs;

-       char *dst, *dstp, *sformat;
+       char *dst, *sformat;
+       const char *dstp;
+       const wchar_t *formatp;

        size_t n, sflen;
        int sverrno;
 
        size_t n, sflen;
        int sverrno;
 

+       NORMALIZE_LOCALE(loc);

        sformat = dst = NULL;
 
        /*
        sformat = dst = NULL;
 
        /*


@@ -63,13 +69,14 @@ wcsftime(wchar_t * __restrict wcs, size_t maxsize,
         * for strftime(), which only handles single-byte characters.
         */
        mbs = initial;
         * for strftime(), which only handles single-byte characters.
         */
        mbs = initial;

-       sflen = wcsrtombs(NULL, &format, 0, &mbs);
+       formatp = format;
+       sflen = wcsrtombs_l(NULL, &formatp, 0, &mbs, loc);

        if (sflen == (size_t)-1)
                goto error;
        if ((sformat = malloc(sflen + 1)) == NULL)
                goto error;
        mbs = initial;
        if (sflen == (size_t)-1)
                goto error;
        if ((sformat = malloc(sflen + 1)) == NULL)
                goto error;
        mbs = initial;

-       wcsrtombs(sformat, &format, sflen + 1, &mbs);
+       wcsrtombs_l(sformat, &formatp, sflen + 1, &mbs, loc);

 
        /*
         * Allocate memory for longest multibyte sequence that will fit
 
        /*
         * Allocate memory for longest multibyte sequence that will fit


@@ -77,18 +84,18 @@ wcsftime(wchar_t * __restrict wcs, size_t maxsize,
         * Then, copy and convert the result back into wide characters in
         * the caller's buffer.
         */
         * Then, copy and convert the result back into wide characters in
         * the caller's buffer.
         */

-       if (SIZE_T_MAX / MB_CUR_MAX <= maxsize) {
+       if (SIZE_T_MAX / MB_CUR_MAX_L(loc) <= maxsize) {

                /* maxsize is prepostorously large - avoid int. overflow. */
                errno = EINVAL;
                goto error;
        }
                /* maxsize is prepostorously large - avoid int. overflow. */
                errno = EINVAL;
                goto error;
        }

-       if ((dst = malloc(maxsize * MB_CUR_MAX)) == NULL)
+       if ((dst = malloc(maxsize * MB_CUR_MAX_L(loc))) == NULL)

                goto error;
                goto error;

-       if (strftime(dst, maxsize, sformat, timeptr) == 0)
+       if (strftime_l(dst, maxsize, sformat, timeptr, loc) == 0)

                goto error;
        dstp = dst;
        mbs = initial;
                goto error;
        dstp = dst;
        mbs = initial;

-       n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, &mbs);
+       n = mbsrtowcs_l(wcs, &dstp, maxsize, &mbs, loc);

        if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL)
                goto error;
 
        if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL)
                goto error;
 


@@ -103,3 +110,10 @@ error:
        errno = sverrno;
        return (0);
 }
        errno = sverrno;
        return (0);
 }

+
+size_t
+wcsftime(wchar_t * __restrict wcs, size_t maxsize,
+    const wchar_t * __restrict format, const struct tm * __restrict timeptr)
+{
+       return wcsftime_l(wcs, maxsize, format, timeptr, __current_locale());
+}