summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-12-12 21:16:19 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-12-12 21:16:19 +0000
commit33ba4fbb9ecc53c0a136cbb81a52fe2515d12fbc (patch)
tree3293df7c47993c488c8cb0bfecdeebe01c110b3a
parent9162861ed90fbc875843c2be6ffc18236752f376 (diff)
tweak previous, and update usage(); ok grunk
-rw-r--r--usr.bin/m4/m4.15
-rw-r--r--usr.bin/m4/misc.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index eb180993a54..5d87750f3e0 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,4 +1,4 @@
-.\" @(#) $OpenBSD: m4.1,v 1.47 2006/12/12 09:24:22 grunk Exp $
+.\" @(#) $OpenBSD: m4.1,v 1.48 2006/12/12 21:16:18 jmc Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -59,7 +59,8 @@ utility is a macro processor that can be used as a front end to any
language (e.g., C, ratfor, fortran, lex, and yacc).
If no input files are given,
.Nm m4
-reads from the standard input, otherwise the files from command line are
+reads from the standard input,
+otherwise files specified on the command line are
processed in the given order.
Input files can be regular files, files in the m4 include paths, or a
single dash
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 7a3ebbe2e96..4d230bacdce 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.35 2006/03/20 10:55:19 espie Exp $ */
+/* $OpenBSD: misc.c,v 1.36 2006/12/12 21:16:18 jmc Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $ */
/*
@@ -340,7 +340,9 @@ xstrdup(const char *s)
void
usage()
{
- fprintf(stderr, "usage: m4 [-gs] [-Dname[=value]] [-d flags] [-I dirname] [-o filename] [-t macro] [-Uname]\n");
+ fprintf(stderr, "usage: m4 [-gs] [-Dname[=value]] [-d flags] "
+ "[-I dirname] [-o filename]\n"
+ "\t[-t macro] [-Uname] [file ...]\n");
exit(1);
}