2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>

@@ -1,6 +1,7 @@
 /*
+ * 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.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -26,14 +27,17 @@
  */
 
 #include "lint.h"
 #include <stdlib.h>
 #include <wchar.h>
+#include <locale.h>
+#include <xlocale.h>
 #include "mblocal.h"
+#include "localeimpl.h"
 
 int
-mblen(const char *s, size_t n)
+mblen_l(const char *s, size_t n, locale_t loc)
 {
         static const mbstate_t initial = { 0 };
         static mbstate_t mbs;
         size_t rval;
 

@@ -40,10 +44,16 @@
         if (s == NULL) {
                 /* No support for state dependent encodings. */
                 mbs = initial;
                 return (0);
         }
-        rval = __mbrtowc(NULL, s, n, &mbs);
+        rval = mbrtowc_l(NULL, s, n, &mbs, 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, uselocale(NULL)));
 }