diff options
| author |   jmc <jmc@openbsd.org> | 2015-07-18 09:33:00 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2015-07-18 09:33:00 +0000 |
| commit | 04b19cb199a97bd86b6ae7b97c7454181a8dedb2 (patch) | |
| tree | 8d78caeffa3a8bbedbe75be0aceb2f1ca892e0a3 | |
| parent | tweak previous; (diff) | |
| download | wireguard-openbsd-04b19cb199a97bd86b6ae7b97c7454181a8dedb2.tar.xz wireguard-openbsd-04b19cb199a97bd86b6ae7b97c7454181a8dedb2.zip | |
various fixes; ok jasper
| -rw-r--r-- | usr.bin/sed/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/sed/sed.1 | 21 |
2 files changed, 11 insertions, 16 deletions
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 8e6fa5b3fd1..276b35160b9 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.21 2015/07/17 21:54:26 jasper Exp $ */ +/* $OpenBSD: main.c,v 1.22 2015/07/18 09:33:00 jmc Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -138,8 +138,8 @@ main(int argc, char *argv[]) default: case '?': (void)fprintf(stderr, - "usage: sed [-aEnru] [-i [extension]] command [file ...]\n" - " sed [-aEnru] [-i [extension]] [-e command] [-f command_file] [file ...]\n"); + "usage: sed [-aEnru] [-i[extension]] command [file ...]\n" + " sed [-aEnru] [-e command] [-f command_file] [-i[extension]] [file ...]\n"); exit(1); } argc -= optind; diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1 index a5307bef7d2..42e8a9a0ebf 100644 --- a/usr.bin/sed/sed.1 +++ b/usr.bin/sed/sed.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sed.1,v 1.45 2015/07/17 20:38:57 jasper Exp $ +.\" $OpenBSD: sed.1,v 1.46 2015/07/18 09:33:00 jmc Exp $ .\" .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" from: @(#)sed.1 8.2 (Berkeley) 12/30/93 .\" -.Dd $Mdocdate: July 17 2015 $ +.Dd $Mdocdate: July 18 2015 $ .Dt SED 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm sed .Op Fl aEnru +.Op Fl i Ns Op Ar extension .Ar command .Op Ar .Nm sed @@ -95,15 +96,15 @@ Append the editing commands found in the file .Ar command_file to the list of commands. The editing commands should each be listed on a separate line. -.It Fl i Ar extension -Edit files in-place, saving backups with the specified +.It Fl i Ns Op Ar extension +Edit files in place, saving backups with the specified .Ar extension . -If a zero-length +If a zero length .Ar extension is given, no backup will be saved. -It is not recommended to give a zero-length +It is not recommended to give a zero length .Ar extension -when in-place editing files, as you risk corruption or partial content +when in place editing files, as it risks corruption or partial content in situations where disk space is exhausted, etc. .It Fl r An alias for @@ -521,12 +522,6 @@ command, squeezing excess empty lines from standard input: .Bd -literal -offset indent $ sed -n ' -.Pp -The -.Fl i -option is a non-standard -.Fx -extension and may not be available on other operating systems. # Write non-empty lines. /./ { p |