1 files changed, 84 insertions, 28 deletions
diff --git a/src/lib/libc/stdlib/strtod.3 b/src/lib/libc/stdlib/strtod.3
index 0b7f973857..0066cc02f3 100644
--- a/src/lib/libc/stdlib/strtod.3
+++ b/src/lib/libc/stdlib/strtod.3
@@ -13,11 +13,7 @@
 .\" 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    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.
 .\"
@@ -33,44 +29,99 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strtod.3      5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: strtod.3,v 1.16 2012/09/16 17:54:03 jmc Exp $
-.\"     $Id: strtod.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd $Mdocdate: September 16 2012 $
 .Dt STRTOD 3
 .Os
 .Sh NAME
-.Nm strtod
+.Nm strtod ,
+.Nm strtof ,
+.Nm strtold
 .Nd convert
 .Tn ASCII
-string to double
+string to double, float or long double
 .Sh SYNOPSIS
+.Fd #include <math.h>
 .Fd #include <stdlib.h>
 .Ft double
 .Fn strtod "const char *nptr" "char **endptr"
+.Pp
+.Ft float
+.Fn strtof "const char *nptr" "char **endptr"
+.Pp
+.Ft long double
+.Fn strtold "const char *nptr" "char **endptr"
 .Sh DESCRIPTION
 The
 .Fn strtod
-function converts the initial portion of the string 
+function converts the initial portion of the string pointed to by
-pointed to by
+.Fa nptr
+to
+.Li double
+representation.
+The
+.Fn strtof
+function converts the initial portion of the string pointed to by
+.Fa nptr
+to
+.Li float
+representation.
+The
+.Fn strtold
+function converts the initial portion of the string pointed to by
 .Fa nptr
 to
-.Em double
+.Li long double
 representation.
 .Pp
-The expected form of the string is an optional plus (``+'') or minus
+The expected form of the string is an optional plus
-sign (``-'') followed by a sequence of digits optionally containing
+.Pq Ql +
+or minus sign
+.Pq Ql -
+followed by a sequence of digits optionally containing
 a decimal-point character, optionally followed by an exponent.
-An exponent consists of an ``E'' or ``e'', followed by an optional plus
+An exponent consists of an
-or minus sign, followed by a sequence of digits.
+.Sq E
+or
+.Sq e ,
+followed by an optional plus or minus sign, followed by a sequence of digits.
+.Pp
+Alternatively, if the portion of the string following the optional
+plus or minus sign begins with
+.Dq INF
+or
+.Dq NAN ,
+ignoring case, it is interpreted as an infinity or a quiet \*(Na,
+respectively.
+The syntax
+.Dq NAN Ns Pq Ar s ,
+where
+.Ar s
+is an alphanumeric string, produces the same value as the call
+.Fo nan
+.Qq Ar s Ns
+.Fc
+(respectively,
+.Fo nanf
+.Qq Ar s Ns
+.Fc
+and
+.Fo nanl
+.Qq Ar s Ns
+.Fc . )
 .Pp
-Leading white-space characters in the string (as defined by the
+In any of the above cases, leading whitespace characters in the
+string (as defined by the
 .Xr isspace 3
 function) are skipped.
 .Sh RETURN VALUES
 The
-.Fn strtod
+.Fn strtod ,
-function returns the converted value, if any.
+.Fn strtof
+and
+.Fn strtold
+functions return the converted value, if any.
 .Pp
 If
 .Fa endptr
@@ -88,18 +139,18 @@ is stored in the location referenced by
 If the correct value would cause overflow, plus or minus
 .Dv HUGE_VAL
 is returned (according to the sign of the value), and
-.Dv ERANGE
+.Er ERANGE
 is stored in
 .Va errno .
-If the correct value would cause underflow, zero is
+If the correct value would cause underflow, zero is returned and
-returned and
+.Er ERANGE
-.Dv ERANGE
+is stored in
-is stored in 
 .Va errno .
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ERANGE
 Overflow or underflow occurred.
+.El
 .Sh SEE ALSO
 .Xr atof 3 ,
 .Xr atoi 3 ,
@@ -109,6 +160,11 @@ Overflow or underflow occurred.
 .Sh STANDARDS
 The
 .Fn strtod
-function
+function conforms to
-conforms to
+.St -ansiC-89 .
-.St -ansiC .
+The
+.Fn strtof
+and
+.Fn strtold
+functions conform to
+.St -ansiC-99 .

diff --git a/src/lib/libc/stdlib/strtod.3 b/src/lib/libc/stdlib/strtod.3 index 0b7f973857..0066cc02f3 100644 --- a/src/lib/libc/stdlib/strtod.3 +++ b/src/lib/libc/stdlib/strtod.3
@@ -13,11 +13,7 @@
13	.\" 2. Redistributions in binary form must reproduce the above copyright	13	.\" 2. Redistributions in binary form must reproduce the above copyright
14	.\" notice, this list of conditions and the following disclaimer in the	14	.\" notice, this list of conditions and the following disclaimer in the
15	.\" documentation and/or other materials provided with the distribution.	15	.\" documentation and/or other materials provided with the distribution.
16	.\" 3. All advertising materials mentioning features or use of this software	16	.\" 3. Neither the name of the University nor the names of its contributors
17	.\" must display the following acknowledgement:
18	.\" This product includes software developed by the University of
19	.\" California, Berkeley and its contributors.
20	.\" 4. Neither the name of the University nor the names of its contributors
21	.\" may be used to endorse or promote products derived from this software	17	.\" may be used to endorse or promote products derived from this software
22	.\" without specific prior written permission.	18	.\" without specific prior written permission.
23	.\"	19	.\"
@@ -33,44 +29,99 @@
33	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	29	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34	.\" SUCH DAMAGE.	30	.\" SUCH DAMAGE.
35	.\"	31	.\"
36	.\" from: @(#)strtod.3 5.3 (Berkeley) 6/29/91	32	.\" $OpenBSD: strtod.3,v 1.16 2012/09/16 17:54:03 jmc Exp $
37	.\" $Id: strtod.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
38	.\"	33	.\"
39	.Dd June 29, 1991	34	.Dd $Mdocdate: September 16 2012 $
40	.Dt STRTOD 3	35	.Dt STRTOD 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
43	.Nm strtod	38	.Nm strtod ,
		39	.Nm strtof ,
		40	.Nm strtold
44	.Nd convert	41	.Nd convert
45	.Tn ASCII	42	.Tn ASCII
46	string to double	43	string to double, float or long double
47	.Sh SYNOPSIS	44	.Sh SYNOPSIS
		45	.Fd #include <math.h>
48	.Fd #include <stdlib.h>	46	.Fd #include <stdlib.h>
49	.Ft double	47	.Ft double
50	.Fn strtod "const char nptr" "char *endptr"	48	.Fn strtod "const char nptr" "char *endptr"
		49	.Pp
		50	.Ft float
		51	.Fn strtof "const char nptr" "char *endptr"
		52	.Pp
		53	.Ft long double
		54	.Fn strtold "const char nptr" "char *endptr"
51	.Sh DESCRIPTION	55	.Sh DESCRIPTION
52	The	56	The
53	.Fn strtod	57	.Fn strtod
54	function converts the initial portion of the string	58	function converts the initial portion of the string pointed to by
55	pointed to by	59	.Fa nptr
		60	to
		61	.Li double
		62	representation.
		63	The
		64	.Fn strtof
		65	function converts the initial portion of the string pointed to by
		66	.Fa nptr
		67	to
		68	.Li float
		69	representation.
		70	The
		71	.Fn strtold
		72	function converts the initial portion of the string pointed to by
56	.Fa nptr	73	.Fa nptr
57	to	74	to
58	.Em double	75	.Li long double
59	representation.	76	representation.
60	.Pp	77	.Pp
61	The expected form of the string is an optional plus (``+'') or minus	78	The expected form of the string is an optional plus
62	sign (``-'') followed by a sequence of digits optionally containing	79	.Pq Ql +
		80	or minus sign
		81	.Pq Ql -
		82	followed by a sequence of digits optionally containing
63	a decimal-point character, optionally followed by an exponent.	83	a decimal-point character, optionally followed by an exponent.
64	An exponent consists of an ``E'' or ``e'', followed by an optional plus	84	An exponent consists of an
65	or minus sign, followed by a sequence of digits.	85	.Sq E
		86	or
		87	.Sq e ,
		88	followed by an optional plus or minus sign, followed by a sequence of digits.
		89	.Pp
		90	Alternatively, if the portion of the string following the optional
		91	plus or minus sign begins with
		92	.Dq INF
		93	or
		94	.Dq NAN ,
		95	ignoring case, it is interpreted as an infinity or a quiet \*(Na,
		96	respectively.
		97	The syntax
		98	.Dq NAN Ns Pq Ar s ,
		99	where
		100	.Ar s
		101	is an alphanumeric string, produces the same value as the call
		102	.Fo nan
		103	.Qq Ar s Ns
		104	.Fc
		105	(respectively,
		106	.Fo nanf
		107	.Qq Ar s Ns
		108	.Fc
		109	and
		110	.Fo nanl
		111	.Qq Ar s Ns
		112	.Fc . )
66	.Pp	113	.Pp
67	Leading white-space characters in the string (as defined by the	114	In any of the above cases, leading whitespace characters in the
		115	string (as defined by the
68	.Xr isspace 3	116	.Xr isspace 3
69	function) are skipped.	117	function) are skipped.
70	.Sh RETURN VALUES	118	.Sh RETURN VALUES
71	The	119	The
72	.Fn strtod	120	.Fn strtod ,
73	function returns the converted value, if any.	121	.Fn strtof
		122	and
		123	.Fn strtold
		124	functions return the converted value, if any.
74	.Pp	125	.Pp
75	If	126	If
76	.Fa endptr	127	.Fa endptr
@@ -88,18 +139,18 @@ is stored in the location referenced by
88	If the correct value would cause overflow, plus or minus	139	If the correct value would cause overflow, plus or minus
89	.Dv HUGE_VAL	140	.Dv HUGE_VAL
90	is returned (according to the sign of the value), and	141	is returned (according to the sign of the value), and
91	.Dv ERANGE	142	.Er ERANGE
92	is stored in	143	is stored in
93	.Va errno .	144	.Va errno .
94	If the correct value would cause underflow, zero is	145	If the correct value would cause underflow, zero is returned and
95	returned and	146	.Er ERANGE
96	.Dv ERANGE	147	is stored in
97	is stored in
98	.Va errno .	148	.Va errno .
99	.Sh ERRORS	149	.Sh ERRORS
100	.Bl -tag -width Er	150	.Bl -tag -width Er
101	.It Bq Er ERANGE	151	.It Bq Er ERANGE
102	Overflow or underflow occurred.	152	Overflow or underflow occurred.
		153	.El
103	.Sh SEE ALSO	154	.Sh SEE ALSO
104	.Xr atof 3 ,	155	.Xr atof 3 ,
105	.Xr atoi 3 ,	156	.Xr atoi 3 ,
@@ -109,6 +160,11 @@ Overflow or underflow occurred.
109	.Sh STANDARDS	160	.Sh STANDARDS
110	The	161	The
111	.Fn strtod	162	.Fn strtod
112	function	163	function conforms to
113	conforms to	164	.St -ansiC-89 .
114	.St -ansiC .	165	The
		166	.Fn strtof
		167	and
		168	.Fn strtold
		169	functions conform to
		170	.St -ansiC-99 .