Libc-594.9.5.tar.gz

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

diff --git a/locale/FreeBSD/mbstowcs.c b/locale/FreeBSD/mbstowcs.c
index 323c788976f6af2cfba198c05974e176dc5939b5..ab2e849eeb7d16649b134368938c97e7a35ce0fd 100644 (file)
--- a/locale/FreeBSD/mbstowcs.c
+++ b/locale/FreeBSD/mbstowcs.c
@@ -1,9 +1,6 @@
 /*-
 /*-

- * Copyright (c) 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
+ * Copyright (c) 2002-2004 Tim J. Robbins.
+ * All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -13,18 +10,11 @@
  * 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.
  * 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.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND

  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)


@@ -35,54 +25,19 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.6 2002/11/09 04:13:26 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.11 2004/07/21 10:54:57 tjr Exp $");

 
 

-#include <errno.h>
-#include <stdlib.h>

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

-#include <stddef.h>
-#include <rune.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include "mblocal.h"

 
 size_t
 mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 {
 
 size_t
 mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 {

-       const char *e;
-       int cnt;
-       rune_t r;
-
-       if (s == NULL) {
-               errno = EINVAL;
-               return (-1);
-       }
-
-       if (pwcs == NULL) {
-               /* Convert and count only, do not store. */
-               cnt = 0;
-               while ((r = sgetrune(s, MB_LEN_MAX, &e)) != _INVALID_RUNE &&
-                   r != 0) {
-                       s = e;
-                       cnt++;
-               }
-               if (r == _INVALID_RUNE) {
-                       errno = EILSEQ;
-                       return (-1);
-               }
-               return (cnt);
-       }
-
-       /* Convert, store and count characters. */
-       cnt = 0;
-       while (n-- > 0) {
-               *pwcs = sgetrune(s, MB_LEN_MAX, &e);
-               if (*pwcs == _INVALID_RUNE) {
-                       errno = EILSEQ;
-                       return (-1);
-               }
-               if (*pwcs++ == L'\0')
-                       break;
-               s = e;
-               ++cnt;
-       }
+       static const mbstate_t initial;
+       mbstate_t mbs;

 
 

-       return (cnt);
+       mbs = initial;
+       return (__mbsnrtowcs(pwcs, &s, SIZE_T_MAX, n, &mbs));

 }
 }