Libc-825.40.1.tar.gz

[apple/libc.git] / stdlib / FreeBSD / atoi.c

diff --git a/stdlib/FreeBSD/atoi.c b/stdlib/FreeBSD/atoi.c
index 3da2fda9be05f90203236963da5b93d62380ad28..ac6fcca974227610969c351764803adbf3d7de17 100644 (file)
--- a/stdlib/FreeBSD/atoi.c
+++ b/stdlib/FreeBSD/atoi.c
@@ -10,10 +10,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.
  * 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.
  * 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.


@@ -35,7 +31,9 @@
 static char sccsid[] = "@(#)atoi.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)atoi.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoi.c,v 1.5 2002/03/22 21:53:09 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoi.c,v 1.6 2007/01/09 00:28:09 imp Exp $");
+
+#include "xlocale_private.h"

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 


@@ -43,5 +41,14 @@ int
 atoi(str)
        const char *str;
 {
 atoi(str)
        const char *str;
 {

-       return (int)strtol(str, (char **)NULL, 10);
+       return (int)strtol_l(str, (char **)NULL, 10, __current_locale());
+}
+
+int
+atoi_l(str, loc)
+       const char *str;
+       locale_t loc;
+{
+       /* no need to call NORMALIZE_LOCALE(loc) because strtol_l will */
+       return (int)strtol_l(str, (char **)NULL, 10, loc);

 }
 }