From dd39f797388913bbd4298865a899a336ff3de11a Mon Sep 17 00:00:00 2001
From: schwarze <schwarze@openbsd.org>
Date: Fri, 1 Dec 2017 11:18:40 +0000
Subject: [PATCH] Consistently .Xr the corresponding wide char functions from
 char- and string-handling <stdio.h> functions, like we already do it for
 <string.h>. Includes a smaller patch from <kshe59 at zoho dot eu>, OK jmc@.

---
 lib/libc/stdio/fgetln.3  | 5 +++--
 lib/libc/stdio/fgets.3   | 5 +++--
 lib/libc/stdio/fputs.3   | 5 +++--
 lib/libc/stdio/getc.3    | 5 +++--
 lib/libc/stdio/getwc.3   | 5 +++--
 lib/libc/stdio/printf.3  | 7 ++++---
 lib/libc/stdio/putc.3    | 5 +++--
 lib/libc/stdio/putwc.3   | 5 +++--
 lib/libc/stdio/scanf.3   | 7 ++++---
 lib/libc/stdio/ungetc.3  | 7 ++++---
 lib/libc/stdio/ungetwc.3 | 7 ++++---
 11 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
index 6cd9c5c9a11..3319e1fdfc7 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fgetln.3,v 1.18 2017/07/04 15:33:03 schwarze Exp $
+.\"	$OpenBSD: fgetln.3,v 1.19 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 4 2017 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt FGETLN 3
 .Os
 .Sh NAME
@@ -110,6 +110,7 @@ or
 .Xr ferror 3 ,
 .Xr fgetc 3 ,
 .Xr fgets 3 ,
+.Xr fgetwln 3 ,
 .Xr fopen 3 ,
 .Xr fparseln 3 ,
 .Xr getline 3
diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3
index b8b3795a173..0acd5b0f860 100644
--- a/lib/libc/stdio/fgets.3
+++ b/lib/libc/stdio/fgets.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fgets.3,v 1.34 2016/08/27 16:39:42 schwarze Exp $
+.\"	$OpenBSD: fgets.3,v 1.35 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 27 2016 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt FGETS 3
 .Os
 .Sh NAME
@@ -113,6 +113,7 @@ or
 .Sh SEE ALSO
 .Xr feof 3 ,
 .Xr ferror 3 ,
+.Xr fgetws 3 ,
 .Xr getline 3
 .Sh STANDARDS
 The function
diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3
index 1e98ecaba11..790de254826 100644
--- a/lib/libc/stdio/fputs.3
+++ b/lib/libc/stdio/fputs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fputs.3,v 1.12 2016/05/26 12:53:28 millert Exp $
+.\"	$OpenBSD: fputs.3,v 1.13 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 26 2016 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt FPUTS 3
 .Os
 .Sh NAME
@@ -86,6 +86,7 @@ for any of the errors specified for the routines
 .Xr write 2 .
 .Sh SEE ALSO
 .Xr ferror 3 ,
+.Xr fputws 3 ,
 .Xr putc 3 ,
 .Xr stdio 3
 .Sh STANDARDS
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index 2b189179b93..a640e92408e 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getc.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
+.\"	$OpenBSD: getc.3,v 1.15 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt GETC 3
 .Os
 .Sh NAME
@@ -101,6 +101,7 @@ until the condition is cleared with
 .Xr ferror 3 ,
 .Xr fopen 3 ,
 .Xr fread 3 ,
+.Xr getwc 3 ,
 .Xr putc 3 ,
 .Xr ungetc 3
 .Sh STANDARDS
diff --git a/lib/libc/stdio/getwc.3 b/lib/libc/stdio/getwc.3
index 906d9ff44ff..442b49ef9fd 100644
--- a/lib/libc/stdio/getwc.3
+++ b/lib/libc/stdio/getwc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getwc.3,v 1.5 2015/09/14 13:45:25 schwarze Exp $
+.\"	$OpenBSD: getwc.3,v 1.6 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\"	$NetBSD: getwc.3,v 1.7 2003/09/08 17:54:32 wiz Exp $
 .\"
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 14 2015 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt GETWC 3
 .Os
 .Sh NAME
@@ -98,6 +98,7 @@ until the condition is cleared with
 .Xr ferror 3 ,
 .Xr fopen 3 ,
 .Xr fread 3 ,
+.Xr getc 3 ,
 .Xr putwc 3 ,
 .Xr stdio 3 ,
 .Xr ungetwc 3
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 6f541f51bd5..379de6d6946 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.76 2017/06/12 18:37:12 millert Exp $
+.\"	$OpenBSD: printf.3,v 1.77 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: June 12 2017 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt PRINTF 3
 .Os
 .Sh NAME
@@ -758,7 +758,8 @@ The return value would be too large to be represented by an
 .El
 .Sh SEE ALSO
 .Xr printf 1 ,
-.Xr scanf 3
+.Xr scanf 3 ,
+.Xr wprintf 3
 .Sh STANDARDS
 The
 .Fn fprintf ,
diff --git a/lib/libc/stdio/putc.3 b/lib/libc/stdio/putc.3
index f48419a7118..d1b5fd1bf90 100644
--- a/lib/libc/stdio/putc.3
+++ b/lib/libc/stdio/putc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: putc.3,v 1.12 2013/07/18 10:14:49 schwarze Exp $
+.\"	$OpenBSD: putc.3,v 1.13 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 18 2013 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt PUTC 3
 .Os
 .Sh NAME
@@ -117,6 +117,7 @@ or
 .Xr ferror 3 ,
 .Xr fopen 3 ,
 .Xr getc 3 ,
+.Xr putwc 3 ,
 .Xr stdio 3
 .Sh STANDARDS
 The functions
diff --git a/lib/libc/stdio/putwc.3 b/lib/libc/stdio/putwc.3
index ee780fb0f40..4a59d6317cf 100644
--- a/lib/libc/stdio/putwc.3
+++ b/lib/libc/stdio/putwc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: putwc.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
+.\"	$OpenBSD: putwc.3,v 1.5 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\"	$NetBSD: putwc.3,v 1.7 2003/09/08 17:54:32 wiz Exp $
 .\"
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 10 2010 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt PUTWC 3
 .Os
 .Sh NAME
@@ -90,6 +90,7 @@ is returned.
 .Xr ferror 3 ,
 .Xr fopen 3 ,
 .Xr getwc 3 ,
+.Xr putc 3 ,
 .Xr stdio 3
 .Sh STANDARDS
 The functions
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index 0b98ea97b22..bcd156c5441 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scanf.3,v 1.22 2013/07/17 05:42:11 schwarze Exp $
+.\"	$OpenBSD: scanf.3,v 1.23 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 17 2013 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt SCANF 3
 .Os
 .Sh NAME
@@ -434,7 +434,8 @@ the number of conversions which were successfully completed is returned.
 .Xr printf 3 ,
 .Xr strtod 3 ,
 .Xr strtol 3 ,
-.Xr strtoul 3
+.Xr strtoul 3 ,
+.Xr wscanf 3
 .Sh STANDARDS
 The functions
 .Fn fscanf ,
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
index 4f976ae9613..2f825b36251 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ungetc.3,v 1.9 2013/07/17 05:42:11 schwarze Exp $
+.\"	$OpenBSD: ungetc.3,v 1.10 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 17 2013 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt UNGETC 3
 .Os
 .Sh NAME
@@ -82,7 +82,8 @@ the operation will fail and the stream will remain unchanged.
 .Sh SEE ALSO
 .Xr fseek 3 ,
 .Xr getc 3 ,
-.Xr setvbuf 3
+.Xr setvbuf 3 ,
+.Xr ungetwc 3
 .Sh STANDARDS
 The
 .Fn ungetc
diff --git a/lib/libc/stdio/ungetwc.3 b/lib/libc/stdio/ungetwc.3
index d5f7337e7d2..389fe771780 100644
--- a/lib/libc/stdio/ungetwc.3
+++ b/lib/libc/stdio/ungetwc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ungetwc.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
+.\"	$OpenBSD: ungetwc.3,v 1.5 2017/12/01 11:18:40 schwarze Exp $
 .\"
 .\"	$NetBSD: ungetwc.3,v 1.7 2003/09/08 17:54:32 wiz Exp $
 .\"
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 10 2010 $
+.Dd $Mdocdate: December 1 2017 $
 .Dt UNGETWC 3
 .Os
 .Sh NAME
@@ -85,7 +85,8 @@ character equals
 the operation will fail and the stream will remain unchanged.
 .Sh SEE ALSO
 .Xr fseek 3 ,
-.Xr getwc 3
+.Xr getwc 3 ,
+.Xr ungetc 3
 .Sh STANDARDS
 The
 .Fn ungetwc
-- 
2.20.1