diff options
| -rw-r--r-- | src/usr.bin/signify/signify.1 | 8 | ||||
| -rw-r--r-- | src/usr.bin/vis/foldit.c | 6 | ||||
| -rw-r--r-- | src/usr.bin/vis/vis.c | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/usr.bin/signify/signify.1 b/src/usr.bin/signify/signify.1 index ab612d5..a731b4a 100644 --- a/src/usr.bin/signify/signify.1 +++ b/src/usr.bin/signify/signify.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signify.1,v 1.50 2020/04/05 06:34:20 deraadt Exp $ +.\" $OpenBSD: signify.1,v 1.51 2020/08/31 16:08:28 deraadt Exp $ .\" .\"Copyright (c) 2013 Marc Espie <espie@openbsd.org> .\"Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> @@ -14,7 +14,7 @@ .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: April 5 2020 $ +.Dd $Mdocdate: August 31 2020 $ .Dt SIGNIFY 1 .Os .Sh NAME @@ -171,12 +171,12 @@ Verify a release directory containing .Pa SHA256.sig and a full set of release files: .Bd -literal -offset indent -compact -$ signify -C -p /etc/signify/openbsd-68-base.pub -x SHA256.sig +$ signify -C -p /etc/signify/openbsd-69-base.pub -x SHA256.sig .Ed .Pp Verify a bsd.rd before an upgrade: .Bd -literal -offset indent -compact -$ signify -C -p /etc/signify/openbsd-68-base.pub -x SHA256.sig bsd.rd +$ signify -C -p /etc/signify/openbsd-69-base.pub -x SHA256.sig bsd.rd .Ed .Pp Sign a gzip archive: diff --git a/src/usr.bin/vis/foldit.c b/src/usr.bin/vis/foldit.c index f9abd99..aaa0592 100644 --- a/src/usr.bin/vis/foldit.c +++ b/src/usr.bin/vis/foldit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: foldit.c,v 1.7 2013/11/12 22:51:18 deraadt Exp $ */ +/* $OpenBSD: foldit.c,v 1.8 2020/08/17 18:41:23 martijn Exp $ */ /* $NetBSD: foldit.c,v 1.4 1994/12/20 16:13:02 jtc Exp $ */ /*- @@ -38,6 +38,7 @@ int foldit(char *chunk, int col, int max) { char *cp; + int first = (col != 0); /* * Keep track of column position. Insert hidden newline @@ -61,8 +62,11 @@ again: col++; } if (col > (max - 2)) { + if (!first) + return (col); printf("\\\n"); col = 0; + first = 0; goto again; } cp++; diff --git a/src/usr.bin/vis/vis.c b/src/usr.bin/vis/vis.c index 38aa9d7..56c25a5 100644 --- a/src/usr.bin/vis/vis.c +++ b/src/usr.bin/vis/vis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vis.c,v 1.20 2016/08/31 09:45:00 jsg Exp $ */ +/* $OpenBSD: vis.c,v 1.21 2020/08/03 01:08:37 deraadt Exp $ */ /* $NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $ */ /*- @@ -130,10 +130,11 @@ void process(FILE *fp) { static int col = 0; - char *cp = "\0"+1; /* so *(cp-1) starts out != '\n' */ + char *cp = "\0"; int c, rachar; char buff[5]; + cp++; /* so *(cp-1) starts out != '\n' */ c = getc(fp); while (c != EOF) { rachar = getc(fp); |