summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2015-11-04 21:28:01 +0000
committertedu <tedu@openbsd.org>2015-11-04 21:28:01 +0000
commit6a6a5705673115d2aa7d0fdcc3d47a27a1b562b2 (patch)
tree998671dc8fdafff7838de1df2fddde77ac7beebf
parentreplace setbuf with setvbuf, from Frederic Nowak (diff)
downloadwireguard-openbsd-6a6a5705673115d2aa7d0fdcc3d47a27a1b562b2.tar.xz
wireguard-openbsd-6a6a5705673115d2aa7d0fdcc3d47a27a1b562b2.zip
replace setbuf with setvbuf, from Frederic Nowak
-rw-r--r--bin/cat/cat.18
-rw-r--r--bin/cat/cat.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index c28182f7302..513aaee767b 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cat.1,v 1.34 2015/01/15 19:06:31 schwarze Exp $
+.\" $OpenBSD: cat.1,v 1.35 2015/11/04 21:28:01 tedu Exp $
.\" $NetBSD: cat.1,v 1.12 1995/09/27 05:38:55 cgd Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -33,7 +33,7 @@
.\"
.\" @(#)cat.1 8.3 (Berkeley) 5/2/95
.\"
-.Dd $Mdocdate: January 15 2015 $
+.Dd $Mdocdate: November 4 2015 $
.Dt CAT 1
.Os
.Sh NAME
@@ -82,7 +82,7 @@ option and also prints tab characters as
.Ql ^I .
.It Fl u
The output is guaranteed to be unbuffered (see
-.Xr setbuf 3 ) .
+.Xr setvbuf 3 ) .
.It Fl v
Displays non-printing characters so they are visible.
Control characters print as
@@ -149,7 +149,7 @@ operand.
.Xr sh 1 ,
.Xr tail 1 ,
.Xr vis 1 ,
-.Xr setbuf 3
+.Xr setvbuf 3
.Rs
.%A Rob Pike
.%T "UNIX Style, or cat -v Considered Harmful"
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 5acecbef5ed..a663dec5ef4 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cat.c,v 1.23 2015/10/09 01:37:06 deraadt Exp $ */
+/* $OpenBSD: cat.c,v 1.24 2015/11/04 21:28:01 tedu Exp $ */
/* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */
/*
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
tflag = vflag = 1; /* -t implies -v */
break;
case 'u':
- setbuf(stdout, NULL);
+ setvbuf(stdout, NULL, _IONBF, 0);
break;
case 'v':
vflag = 1;