1 files changed, 84 insertions, 31 deletions
diff --git a/src/lib/libc/stdlib/strtod.3 b/src/lib/libc/stdlib/strtod.3
index 0b7f973857..6f079b73a9 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,96 @@
 .\" 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.19 2014/01/19 10:39:00 schwarze Exp $
-.\"     $Id: strtod.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd $Mdocdate: January 19 2014 $
 .Dt STRTOD 3
 .Os
 .Sh NAME
-.Nm strtod
+.Nm strtod ,
-.Nd convert
+.Nm strtof ,
-.Tn ASCII
+.Nm strtold
-string to double
+.Nd convert ASCII string to double, float or long double
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In 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 +136,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 +157,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..6f079b73a9 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,96 @@
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.19 2014/01/19 10:39:00 schwarze 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: January 19 2014 $
40	.Dt STRTOD 3	35	.Dt STRTOD 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
43	.Nm strtod	38	.Nm strtod ,
44	.Nd convert	39	.Nm strtof ,
45	.Tn ASCII	40	.Nm strtold
46	string to double	41	.Nd convert ASCII string to double, float or long double
47	.Sh SYNOPSIS	42	.Sh SYNOPSIS
48	.Fd #include <stdlib.h>	43	.In stdlib.h
49	.Ft double	44	.Ft double
50	.Fn strtod "const char nptr" "char *endptr"	45	.Fn strtod "const char nptr" "char *endptr"
		46	.Pp
		47	.Ft float
		48	.Fn strtof "const char nptr" "char *endptr"
		49	.Pp
		50	.Ft long double
		51	.Fn strtold "const char nptr" "char *endptr"
51	.Sh DESCRIPTION	52	.Sh DESCRIPTION
52	The	53	The
53	.Fn strtod	54	.Fn strtod
54	function converts the initial portion of the string	55	function converts the initial portion of the string pointed to by
55	pointed to by	56	.Fa nptr
		57	to
		58	.Li double
		59	representation.
		60	The
		61	.Fn strtof
		62	function converts the initial portion of the string pointed to by
		63	.Fa nptr
		64	to
		65	.Li float
		66	representation.
		67	The
		68	.Fn strtold
		69	function converts the initial portion of the string pointed to by
56	.Fa nptr	70	.Fa nptr
57	to	71	to
58	.Em double	72	.Li long double
59	representation.	73	representation.
60	.Pp	74	.Pp
61	The expected form of the string is an optional plus (``+'') or minus	75	The expected form of the string is an optional plus
62	sign (``-'') followed by a sequence of digits optionally containing	76	.Pq Ql +
		77	or minus sign
		78	.Pq Ql -
		79	followed by a sequence of digits optionally containing
63	a decimal-point character, optionally followed by an exponent.	80	a decimal-point character, optionally followed by an exponent.
64	An exponent consists of an ``E'' or ``e'', followed by an optional plus	81	An exponent consists of an
65	or minus sign, followed by a sequence of digits.	82	.Sq E
		83	or
		84	.Sq e ,
		85	followed by an optional plus or minus sign, followed by a sequence of digits.
		86	.Pp
		87	Alternatively, if the portion of the string following the optional
		88	plus or minus sign begins with
		89	.Dq INF
		90	or
		91	.Dq NAN ,
		92	ignoring case, it is interpreted as an infinity or a quiet \*(Na,
		93	respectively.
		94	The syntax
		95	.Dq NAN Ns Pq Ar s ,
		96	where
		97	.Ar s
		98	is an alphanumeric string, produces the same value as the call
		99	.Fo nan
		100	.Qq Ar s Ns
		101	.Fc
		102	(respectively,
		103	.Fo nanf
		104	.Qq Ar s Ns
		105	.Fc
		106	and
		107	.Fo nanl
		108	.Qq Ar s Ns
		109	.Fc . )
66	.Pp	110	.Pp
67	Leading white-space characters in the string (as defined by the	111	In any of the above cases, leading whitespace characters in the
		112	string (as defined by the
68	.Xr isspace 3	113	.Xr isspace 3
69	function) are skipped.	114	function) are skipped.
70	.Sh RETURN VALUES	115	.Sh RETURN VALUES
71	The	116	The
72	.Fn strtod	117	.Fn strtod ,
73	function returns the converted value, if any.	118	.Fn strtof
		119	and
		120	.Fn strtold
		121	functions return the converted value, if any.
74	.Pp	122	.Pp
75	If	123	If
76	.Fa endptr	124	.Fa endptr
@@ -88,18 +136,18 @@ is stored in the location referenced by
88	If the correct value would cause overflow, plus or minus	136	If the correct value would cause overflow, plus or minus
89	.Dv HUGE_VAL	137	.Dv HUGE_VAL
90	is returned (according to the sign of the value), and	138	is returned (according to the sign of the value), and
91	.Dv ERANGE	139	.Er ERANGE
92	is stored in	140	is stored in
93	.Va errno .	141	.Va errno .
94	If the correct value would cause underflow, zero is	142	If the correct value would cause underflow, zero is returned and
95	returned and	143	.Er ERANGE
96	.Dv ERANGE	144	is stored in
97	is stored in
98	.Va errno .	145	.Va errno .
99	.Sh ERRORS	146	.Sh ERRORS
100	.Bl -tag -width Er	147	.Bl -tag -width Er
101	.It Bq Er ERANGE	148	.It Bq Er ERANGE
102	Overflow or underflow occurred.	149	Overflow or underflow occurred.
		150	.El
103	.Sh SEE ALSO	151	.Sh SEE ALSO
104	.Xr atof 3 ,	152	.Xr atof 3 ,
105	.Xr atoi 3 ,	153	.Xr atoi 3 ,
@@ -109,6 +157,11 @@ Overflow or underflow occurred.
109	.Sh STANDARDS	157	.Sh STANDARDS
110	The	158	The
111	.Fn strtod	159	.Fn strtod
112	function	160	function conforms to
113	conforms to	161	.St -ansiC-89 .
114	.St -ansiC .	162	The
		163	.Fn strtof
		164	and
		165	.Fn strtold
		166	functions conform to
		167	.St -ansiC-99 .