Libc-1082.50.1.tar.gz

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

diff --git a/locale/FreeBSD/mblen.c b/locale/FreeBSD/mblen.c
index 82e06583ed3131fc5da7eb6b7b3dfd49fed74b29..f6bfa52790dc55d6749eccb00bd2eadab75eb5cc 100644 (file)
--- a/locale/FreeBSD/mblen.c
+++ b/locale/FreeBSD/mblen.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
@@ -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.
- * 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
- * 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)
@@ -35,24 +25,34 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.4 2002/10/28 08:24:46 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.9 2004/07/29 06:18:40 tjr Exp $");
+
+#include "xlocale_private.h"
 
-#include <errno.h>
-#include <stddef.h>
 #include <stdlib.h>
-#include <rune.h>
+#include <wchar.h>
+#include "mblocal.h"
 
 int
-mblen(const char *s, size_t n)
+mblen_l(const char *s, size_t n, locale_t loc)
 {
-       const char *e;
+       static const mbstate_t initial;
+       size_t rval;
 
-       if (s == NULL)
+       NORMALIZE_LOCALE(loc);
+       if (s == NULL) {
                /* No support for state dependent encodings. */
-               return (0);     
-       if (sgetrune(s, n, &e) == _INVALID_RUNE) {
-               errno = EILSEQ;
-               return (-1);
+               loc->__mbs_mblen = initial;
+               return (0);
        }
-       return (*s == '\0' ? 0 : e - s);
+       rval = loc->__lc_ctype->__mbrtowc(NULL, s, n, &loc->__mbs_mblen, loc);
+       if (rval == (size_t)-1 || rval == (size_t)-2)
+               return (-1);
+       return ((int)rval);
+}
+
+int
+mblen(const char *s, size_t n)
+{
+       return mblen_l(s, n, __current_locale());
 }