Implement -s.

Triggered by recent FreeBSD changes.

- emits #line directives at every file change (like FreeBSD)
- maintains a synch_lineno variable to verify when the output gets out
of synch with the input, so that it can emit #line to re-synch as well
(unlike FreeBSD)

To do: either handle \end-of-line, or recognize when a macro expansion
is in progress, so that line synch don't perturb cpp on multi-line
expansions.

With this, we should have a fully POSIX-compliant m4.

ok miod@

1 files changed, 5 insertions, 1 deletions

diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index ccd793d6e2a..ef78e7c9ca4 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,4 +1,4 @@
-.\"	@(#) $OpenBSD: m4.1,v 1.24 2002/04/18 18:57:23 espie Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.25 2002/04/28 14:37:12 espie Exp $
 .\"
 .\"
 .Dd January 26, 1993
@@ -12,6 +12,7 @@
 .Op Fl d Ar flags
 .Op Fl t Ar name
 .Op Fl g
+.Op Fl s
 .Oo
 .Fl D Ns Ar name Ns Op Ar =value
 .Oc
@@ -104,6 +105,9 @@ In this mode, changequote with
 two empty parameters deactivates quotes, translit handles simple character
 ranges (e.g., a-z), regular expressions mimic emacs behavior,
 and the number of diversions is unlimited.
+.It Fl s
+Output line synchronization directives, suitable for
+.Xr cpp 1 .
 .El
 .Sh SYNTAX
 .Nm m4