m4 -N

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

How embarrassing:
$ m4 -N 1000
m4: Warning: `m4 -N' is deprecated
m4: INTERNAL ERROR: bad code in deferred arguments
Segmentation fault (core dumped)

I'm making 'm4 -N' the no-op that 1.4.7 claimed it should be for
branch-1.4.  Then, since no one has complained in almost 2 years, I'm
nuking -N altogether in branch-1.6 and master.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkipetYACgkQ84KuGfSFAYCOxACgwtVG+LzmotDXCkHXsHUTssiT
6ywAniL5jA0+Os0zQpUdCgSC2OeZ1UuC
=yne2
-----END PGP SIGNATURE-----

>From 8eb84b42e32728a5abd8623012a9b95605ed0a35 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 18 Aug 2008 07:32:30 -0600
Subject: [PATCH] Fix crash with 'm4 -N9', regression from 2006-09-14.

* src/m4.c (main): Add missing break.
* NEWS: Document it.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog |    6 ++++++
 NEWS      |    3 +++
 src/m4.c  |    1 +
 3 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 758e610..51b3165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-18  Eric Blake  <address@hidden>
+
+       Fix crash with 'm4 -N9', regression from 2006-09-14.
+       * src/m4.c (main): Add missing break.
+       * NEWS: Document it.
+
 2008-08-15  Eric Blake  <address@hidden>
 
        Documentation updates.
diff --git a/NEWS b/NEWS
index a208c3f..0190fa8 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ Foundation, Inc.
    a macro.  This was most noticeable with `traceon(`traceon')', but
    would also happen in cases such as `foo(traceon(`foo'))'.
 
+** Fix regression introduced in 1.4.7 where `m4 -N9' died with an assertion
+   failure.
+
 ** New `-g'/`--gnu' command-line option overrides `-G'/`--traditional'.
    For now, the environment variable POSIXLY_CORRECT has no effect on M4
    behavior; but a future release of M4 will behave as though --traditional
diff --git a/src/m4.c b/src/m4.c
index 6abd3e1..e1f5bb0 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -440,6 +440,7 @@ main (int argc, char *const *argv, char *const *envp)
        /* -N became an obsolete no-op in 1.4.x.  */
        error (0, 0, "Warning: `m4 %s' is deprecated",
               optchar == 'N' ? "-N" : "--diversions");
+       break;
 
       case 'D':
       case 'U':
-- 
1.5.6.4