diff options
| author |   sobrado <sobrado@openbsd.org> | 2007-08-14 17:41:10 +0000 |
|---|---|---|
| committer | sobrado <sobrado@openbsd.org> | 2007-08-14 17:41:10 +0000 |
| commit | 4bdcd61a521b66148d5324eac04fb5411e265311 (patch) | |
| tree | e8dee096c2b3bb7b8b7e81a4f269214b3b52f40f | |
| parent | sync printing w/ sysctl(8) and add missing sensor types to conf parser; (diff) | |
| download | wireguard-openbsd-4bdcd61a521b66148d5324eac04fb5411e265311.tar.xz wireguard-openbsd-4bdcd61a521b66148d5324eac04fb5411e265311.zip | |
the ellipsis is not an optional argument; document the "-a" flag in whereis(1)
help and feedback by jmc@ and otto@
ok deraadt@, jmc@ and otto@
| -rw-r--r-- | usr.bin/which/whereis.1 | 13 | ||||
| -rw-r--r-- | usr.bin/which/which.1 | 6 | ||||
| -rw-r--r-- | usr.bin/which/which.c | 6 |
3 files changed, 16 insertions, 9 deletions
diff --git a/usr.bin/which/whereis.1 b/usr.bin/which/whereis.1 index 235efa09583..ac4f382a4fb 100644 --- a/usr.bin/which/whereis.1 +++ b/usr.bin/which/whereis.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: whereis.1,v 1.10 2007/05/31 19:20:20 jmc Exp $ +.\" $OpenBSD: whereis.1,v 1.11 2007/08/14 17:41:10 sobrado Exp $ .\" $NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $ .\" .\" Copyright (c) 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)whereis.1 8.3 (Berkeley) 4/27/95 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 14 2007 $ .Dt WHEREIS 1 .Os .Sh NAME @@ -38,7 +38,8 @@ .Nd locate programs .Sh SYNOPSIS .Nm whereis -.Ar name Op Ar ... +.Op Fl a +.Ar name ... .Sh DESCRIPTION The .Nm @@ -52,6 +53,12 @@ utility for the .Dq user.cs_path string. .Pp +If the +.Fl a +flag is given, +.Nm +will return a list of all matches instead of just the first match. +.Pp The .Nm utility exits with one of the following values: diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1 index ff1d8f43074..fb92b85b859 100644 --- a/usr.bin/which/which.1 +++ b/usr.bin/which/which.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: which.1,v 1.15 2007/05/31 19:20:20 jmc Exp $ +.\" $OpenBSD: which.1,v 1.16 2007/08/14 17:41:10 sobrado Exp $ .\" .\" Copyright (c) 1980, 1991 Regents of the University of California. .\" All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)which.1 6.3 (Berkeley) 4/23/91 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 14 2007 $ .Dt WHICH 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh SYNOPSIS .Nm which .Op Fl a -.Ar name Op Ar ... +.Ar name ... .Sh DESCRIPTION .Nm takes a list of names and looks for the files which would be diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c index d166c06ce9f..d799d6d5c58 100644 --- a/usr.bin/which/which.c +++ b/usr.bin/which/which.c @@ -1,4 +1,4 @@ -/* $OpenBSD: which.c,v 1.13 2004/09/24 19:45:27 fgsch Exp $ */ +/* $OpenBSD: which.c,v 1.14 2007/08/14 17:41:10 sobrado Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -17,7 +17,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: which.c,v 1.13 2004/09/24 19:45:27 fgsch Exp $"; +static const char rcsid[] = "$OpenBSD: which.c,v 1.14 2007/08/14 17:41:10 sobrado Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -170,6 +170,6 @@ findprog(char *prog, char *path, int progmode, int allmatches) __dead void usage(void) { - (void) fprintf(stderr, "Usage: %s [-a] name [...]\n", __progname); + (void)fprintf(stderr, "usage: %s [-a] name ...\n", __progname); exit(1); } |