Module Name: src
Committed By: wiz
Date: Fri Nov 2 02:07:19 UTC 2012
Modified Files:
src/usr.bin/flock: flock.1 flock.c
Log Message:
Use longer -c description.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/flock/flock.1
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/flock/flock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/flock/flock.1
diff -u src/usr.bin/flock/flock.1:1.4 src/usr.bin/flock/flock.1:1.5
--- src/usr.bin/flock/flock.1:1.4 Fri Nov 2 02:03:18 2012
+++ src/usr.bin/flock/flock.1 Fri Nov 2 02:07:19 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: flock.1,v 1.4 2012/11/02 02:03:18 wiz Exp $
+.\" $NetBSD: flock.1,v 1.5 2012/11/02 02:07:19 wiz Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -39,7 +39,8 @@
.Op Fl dnosvx
.Op Fl w Ar timeout
.Ar lockfile|lockdir
-.Op Fl c
+.Op Fl c Ar command
+|
.Op Ar command ...
.Nm
.Op Fl dnsuvx
Index: src/usr.bin/flock/flock.c
diff -u src/usr.bin/flock/flock.c:1.3 src/usr.bin/flock/flock.c:1.4
--- src/usr.bin/flock/flock.c:1.3 Fri Nov 2 02:03:18 2012
+++ src/usr.bin/flock/flock.c Fri Nov 2 02:07:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: flock.c,v 1.3 2012/11/02 02:03:18 wiz Exp $ */
+/* $NetBSD: flock.c,v 1.4 2012/11/02 02:07:19 wiz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: flock.c,v 1.3 2012/11/02 02:03:18 wiz Exp $");
+__RCSID("$NetBSD: flock.c,v 1.4 2012/11/02 02:07:19 wiz Exp $");
#include <stdio.h>
#include <string.h>
@@ -65,8 +65,8 @@ static sig_atomic_t timeout_expired;
static __dead void usage(void)
{
- fprintf(stderr, "Usage: %s [-dnosvx] [-w timeout] lockfile|lockdir [-c] "
- "command\n\t%s [-dnsuvx] [-w timeout] lockfd\n", getprogname(),
+ fprintf(stderr, "Usage: %s [-dnosvx] [-w timeout] lockfile|lockdir [-c command]| "
+ "command ...\n\t%s [-dnsuvx] [-w timeout] lockfd\n", getprogname(),
getprogname());
exit(EXIT_FAILURE);
}
