diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am index c18b67551a..91e166d6c3 100644 --- a/lib/libspl/Makefile.am +++ b/lib/libspl/Makefile.am @@ -14,6 +14,7 @@ libspl_la_SOURCES = \ ${top_srcdir}/lib/libspl/strlcat.c \ ${top_srcdir}/lib/libspl/strlcpy.c \ ${top_srcdir}/lib/libspl/strnlen.c \ + ${top_srcdir}/lib/libspl/strtoxx.c \ ${top_srcdir}/lib/libspl/u8_textprep.c \ ${top_srcdir}/lib/libspl/zone.c \ ${top_srcdir}/lib/libspl/include/sys/list.h \ diff --git a/lib/libspl/include/sys/sunddi.h b/lib/libspl/include/sys/sunddi.h new file mode 100644 index 0000000000..5d28fe7737 --- /dev/null +++ b/lib/libspl/include/sys/sunddi.h @@ -0,0 +1,34 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright (c) 2008 by Sun Microsystems, Inc. + */ + +#ifndef _SYS_SUNDDI_H +#define _SYS_SUNDDI_H + +extern int ddi_strtoul(const char *, char **, int, unsigned long *); +extern int ddi_strtol(const char *, char **, int, long *); +extern int ddi_strtoull(const char *, char **, int, unsigned long long *); +extern int ddi_strtoll(const char *, char **, int, long long *); + +#endif /* _SYS_SUNDDI_H */ diff --git a/lib/libspl/strtoxx.c b/lib/libspl/strtoxx.c new file mode 100644 index 0000000000..67950686e3 --- /dev/null +++ b/lib/libspl/strtoxx.c @@ -0,0 +1,85 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#include +#include +#include + +int +ddi_strtoul(const char *str, char **endptr, int base, + unsigned long *result) +{ + unsigned long val; + + errno = 0; + val = strtoul(str, endptr, base); + if (errno == 0) + *result = val; + + return errno; +} + +int +ddi_strtol(const char *str, char **endptr, int base, + long *result) +{ + long val; + + errno = 0; + val = strtol(str, endptr, base); + if (errno == 0) + *result = val; + + return errno; +} + +int +ddi_strtoull(const char *str, char **endptr, int base, + unsigned long long *result) +{ + unsigned long long val; + + errno = 0; + val = strtoull(str, endptr, base); + if (errno == 0) + *result = val; + + return errno; +} + +int +ddi_strtoll(const char *str, char **endptr, int base, + long long *result) +{ + long long val; + + errno = 0; + val = strtoll(str, endptr, base); + if (errno == 0) + *result = val; + + return errno; +}