Libc-1439.40.11.tar.gz

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

diff --git a/locale/FreeBSD/none.c b/locale/FreeBSD/none.c
index 0514bc4632ca75910db731254fc0097152b4a60c..b6a346dc3badd678e8b6c319806227898560984e 100644 (file)
--- a/locale/FreeBSD/none.c
+++ b/locale/FreeBSD/none.c
@@ -1,4 +1,6 @@
 /*-
+ * Copyright 2013 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
  * Copyright (c) 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -6,6 +8,11 @@
  * This code is derived from software contributed to Berkeley by
  * Paul Borman at Krystal Technologies.
  *
+ * Copyright (c) 2011 The FreeBSD Foundation
+ * All rights reserved.
+ * Portions of this software were developed by David Chisnall
+ * under sponsorship from the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -14,10 +21,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -39,7 +42,9 @@
 static char sccsid[] = "@(#)none.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.12 2004/07/21 10:54:57 tjr Exp $");
+__FBSDID("$FreeBSD$");
+
+#include "xlocale_private.h"
 
 #include <errno.h>
 #include <limits.h>
@@ -51,33 +56,27 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.12 2004/07/21 10:54:57 tjr Ex
 #include <wchar.h>
 #include "mblocal.h"
 
-int    _none_init(_RuneLocale *);
-size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-           mbstate_t * __restrict);
-int    _none_mbsinit(const mbstate_t *);
-size_t _none_mbsnrtowcs(wchar_t * __restrict dst,
-           const char ** __restrict src, size_t nms, size_t len,
-           mbstate_t * __restrict ps __unused);
-size_t _none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-           size_t, size_t, mbstate_t * __restrict);
+/* setup defaults */
+
+int __mb_cur_max = 1;
+int __mb_sb_limit = 256; /* Expected to be <= _CACHED_RUNES */
 
 int
-_none_init(_RuneLocale *rl)
+_none_init(struct __xlocale_st_runelocale *xrl)
 {
 
-       __mbrtowc = _none_mbrtowc;
-       __mbsinit = _none_mbsinit;
-       __mbsnrtowcs = _none_mbsnrtowcs;
-       __wcrtomb = _none_wcrtomb;
-       __wcsnrtombs = _none_wcsnrtombs;
-       _CurrentRuneLocale = rl;
-       __mb_cur_max = 1;
+       xrl->__mbrtowc = _none_mbrtowc;
+       xrl->__mbsinit = _none_mbsinit;
+       xrl->__mbsnrtowcs = _none_mbsnrtowcs;
+       xrl->__wcrtomb = _none_wcrtomb;
+       xrl->__wcsnrtombs = _none_wcsnrtombs;
+       xrl->__mb_cur_max = 1;
+       xrl->__mb_sb_limit = 256;
        return(0);
 }
 
 int
-_none_mbsinit(const mbstate_t *ps __unused)
+_none_mbsinit(const mbstate_t *ps __unused, locale_t loc __unused)
 {
 
        /*
@@ -89,7 +88,7 @@ _none_mbsinit(const mbstate_t *ps __unused)
 
 size_t
 _none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps __unused)
+    mbstate_t * __restrict ps __unused, locale_t loc __unused)
 {
 
        if (s == NULL)
@@ -105,7 +104,7 @@ _none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
 
 size_t
 _none_wcrtomb(char * __restrict s, wchar_t wc,
-    mbstate_t * __restrict ps __unused)
+    mbstate_t * __restrict ps __unused, locale_t loc __unused)
 {
 
        if (s == NULL)
@@ -121,7 +120,7 @@ _none_wcrtomb(char * __restrict s, wchar_t wc,
 
 size_t
 _none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps __unused)
+    size_t nms, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)
 {
        const char *s;
        size_t nchr;
@@ -146,7 +145,7 @@ _none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
 
 size_t
 _none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps __unused)
+    size_t nwc, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)
 {
        const wchar_t *s;
        size_t nchr;
@@ -165,6 +164,7 @@ _none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
        nchr = 0;
        while (len-- > 0 && nwc-- > 0) {
                if (*s < 0 || *s > UCHAR_MAX) {
+                       *src = s;
                        errno = EILSEQ;
                        return ((size_t)-1);
                }