From 8ff956812153ab7ed49eabffee8dbd3a53bf419c Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 11 Oct 2013 22:18:38 +0200 Subject: [PATCH] pwd(1): Sync with FreeBSD (very minor, mainly editorial) --- bin/pwd/pwd.1 | 10 +++++----- bin/pwd/pwd.c | 17 ++++++++--------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1 index 89b7b0877c..69afa8c298 100644 --- a/bin/pwd/pwd.1 +++ b/bin/pwd/pwd.1 @@ -1,3 +1,4 @@ +.\"- .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -29,10 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.10.2.5 2002/06/17 11:04:22 tjr Exp $ -.\" $DragonFly: src/bin/pwd/pwd.1,v 1.3 2006/02/17 19:33:31 swildner Exp $ +.\" $FreeBSD: head/bin/pwd/pwd.1 140353 2005-01-16 16:41:59Z ru $ .\" -.Dd February 4, 2002 +.Dd April 12, 2003 .Dt PWD 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd return working directory name .Sh SYNOPSIS .Nm -.Op Fl LP +.Op Fl L | P .Sh DESCRIPTION The .Nm @@ -87,7 +87,7 @@ utility conforms to .St -p1003.1-2001 . .Sh BUGS In -.Xr csh 1 +.Xr csh 1 the command .Ic dirs is always faster because it is built into that shell. diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 82e8d04a59..5a14246c14 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * @@ -26,24 +26,22 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) Copyright (c) 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)pwd.c 8.3 (Berkeley) 4/1/94 - * $FreeBSD: src/bin/pwd/pwd.c,v 1.9.2.3 2002/06/17 11:04:22 tjr Exp $ + * $FreeBSD: head/bin/pwd/pwd.c 141578 2005-02-09 17:37:39Z ru $ */ #include -#include #include +#include #include #include #include #include -#include #include -static char *getcwd_logical(void); -static void usage(void); +static char *getcwd_logical(void); +void usage(void); int main(int argc, char *argv[]) @@ -84,10 +82,11 @@ main(int argc, char *argv[]) exit(0); } -static void +void usage(void) { - fprintf(stderr, "usage: pwd [-LP]\n"); + + (void)fprintf(stderr, "usage: pwd [-L | -P]\n"); exit(1); } -- 2.41.0