Import from OpenBSD: -E flag

Add -E flag (make warnings fatal), following the behavior of GNU m4 1.4.9+

Help and direction millert@ espie@ anton@ deraadt@

ok espie@

Obtained from:	OpenBSD

diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 34d956e3aefe95167297e53a09508b5222cd2e5c..1630b461f4239f4b533d793432374882aa24a7bc 100644 (file)
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: eval.c,v 1.74 2015/02/05 12:59:57 millert Exp $       */
+/*     $OpenBSD: eval.c,v 1.75 2017/06/15 13:48:42 bcallah Exp $       */
 /*     $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $      */
 
 /*-
@@ -275,6 +275,10 @@ expand_builtin(const char *argv[], int argc, int td)
                                        warn("%s at line %lu: include(%s)",
                                            CURRENT_NAME, CURRENT_LINE, argv[2]);
                                        exit_code = 1;
+                                       if (fatal_warns) {
+                                               killdiv();
+                                               exit(exit_code);
+                                       }
                                } else
                                        err(1, "%s at line %lu: include(%s)",
                                            CURRENT_NAME, CURRENT_LINE, argv[2]);

diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 7e994cc301a5e344a35549c5bdde53d62421bfe6..b2aff26cda1c09af34ae39c9c7a494b5ddf133d7 100644 (file)
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: extern.h,v 1.54 2014/05/12 19:11:19 espie Exp $       */
+/*     $OpenBSD: extern.h,v 1.55 2017/06/15 13:48:42 bcallah Exp $     */
 /*     $NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $    */
 
 /*-
@@ -61,6 +61,8 @@ extern void doesyscmd(const char *);
 extern void getdivfile(const char *);
 extern void doformat(const char *[], int);
 
+extern void m4_warnx(const char *, ...);
+
 /* look.c */
 
 #define FLAG_UNTRACED 0
@@ -178,4 +180,5 @@ extern int  synch_lines;    /* line synchronisation directives */
 
 extern int mimic_gnu;          /* behaves like gnu-m4 */
 extern int prefix_builtins;    /* prefix builtin macros with m4_ */
-
+extern int error_warns;                /* make warnings cause exit_code = 1 */
+extern int fatal_warns;                /* make warnings fatal */

diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index 4ac7196150db51e28038e9578d6d1a98af303c31..9053371516789dcd7dd0db72909754233b38eaa8 100644 (file)
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gnum4.c,v 1.50 2015/04/29 00:13:26 millert Exp $ */
+/* $OpenBSD: gnum4.c,v 1.51 2017/06/15 13:48:42 bcallah Exp $ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <paths.h>
 #include <regex.h>
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -259,11 +260,29 @@ exit_regerror(int er, regex_t *re, const char *source)
        m4errx(1, "regular expression error in %s: %s.", source, errbuf);
 }
 
+/* warnx() plus check to see if we need to change exit code or exit .
+ * -E flag functionality.
+ */
+void
+m4_warnx(const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       warnx(fmt, ap);
+       va_end(ap);
+
+       if (fatal_warns)
+               exit(1);
+       if (error_warns)
+               exit_code = 1;
+}
+
 static void
 add_sub(int n, const char *string, regex_t *re, regmatch_t *pm)
 {
        if (n > (int)re->re_nsub)
-               warnx("No subexpression %d", n);
+               m4_warnx("No subexpression %d", n);
        /* Subexpressions that did not match are
         * not an error.  */
        else if (pm[n].rm_so != -1 &&
@@ -446,7 +465,7 @@ void
 dopatsubst(const char *argv[], int argc)
 {
        if (argc <= 3) {
-               warnx("Too few arguments to patsubst");
+               m4_warnx("Too few arguments to patsubst");
                return;
        }
        /* special case: empty regexp */
@@ -498,7 +517,7 @@ doregexp(const char *argv[], int argc)
        const char *source;
 
        if (argc <= 3) {
-               warnx("Too few arguments to regexp");
+               m4_warnx("Too few arguments to regexp");
                return;
        }
        /* special gnu case */

diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 1429cdee0cc988e818a653230830470587a57ef5..6b5dbd99331c3448ab14f74d265f5ee337a2efe7 100644 (file)
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"    $NetBSD: m4.1,v 1.23 2012/04/08 22:00:39 wiz Exp $
-.\"    @(#) $OpenBSD: m4.1,v 1.63 2015/09/14 20:06:58 schwarze Exp $
+.\"    @(#) $OpenBSD: m4.1,v 1.64 2017/06/15 13:48:42 bcallah Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd $Mdocdate: September 14 2015 $
+.Dd $Mdocdate: June 15 2017 $
 .Dt M4 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nd macro language processor
 .Sh SYNOPSIS
 .Nm
-.Op Fl gPs
+.Op Fl EgPs
 .Oo
 .Sm off
 .Fl D Ar name Op No = Ar value
@@ -130,6 +130,21 @@ turn on all options.
 .Pp
 By default, trace is set to
 .Qq eq .
+.It Fl E
+Set warnings to be fatal.
+When a single
+.Fl E
+flag is specified, if warnings are issued, execution
+continues but
+.Nm
+will exit with a non-zero exit status.
+When multiple
+.Fl E
+flags are specified, execution will halt upon issuing the
+first warning and
+.Nm
+will exit with a non-zero exit status.
+This behaviour matches GNU-m4 1.4.9 and later.
 .It Fl g
 Activate GNU-m4 compatibility mode.
 In this mode, translit handles simple character
@@ -437,7 +452,9 @@ Returns the current file's name.
 .Pp
 But note that the
 .Ic m4exit
-macro can modify the exit status.
+macro can modify the exit status, as can the
+.Fl E
+flag.
 .Sh STANDARDS
 The
 .Nm
@@ -446,7 +463,7 @@ utility is compliant with the
 specification.
 .Pp
 The flags
-.Op Fl dgIPot
+.Op Fl dEgIPot
 and the macros
 .Ic builtin ,
 .Ic esyscmd ,

diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index c43dedda035c8e99f63357ff59f3e9723a15845b..292dc5eb3f760daea5c88f7a6953eab869cb9db3 100644 (file)
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.86 2015/11/03 16:21:47 deraadt Exp $       */
+/*     $OpenBSD: main.c,v 1.87 2017/06/15 13:48:42 bcallah Exp $       */
 /*     $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $    */
 
 /*-
@@ -81,6 +81,8 @@ char scommt[MAXCCHARS+1] = {SCOMMT};  /* start character for comment */
 char ecommt[MAXCCHARS+1] = {ECOMMT};   /* end character for comment   */
 int  synch_lines = 0;          /* line synchronisation for C preprocessor */
 int  prefix_builtins = 0;      /* -P option to prefix builtin keywords */
+int  error_warns = 0;          /* -E option to make warnings exit_code = 1 */
+int  fatal_warns = 0;          /* -E -E option to make warnings fatal */
 
 struct keyblk {
         const char    *knam;          /* keyword name */
@@ -186,7 +188,7 @@ main(int argc, char *argv[])
        outfile = NULL;
        resizedivs(MAXOUT);
 
-       while ((c = getopt(argc, argv, "gst:d:D:U:o:I:P")) != -1)
+       while ((c = getopt(argc, argv, "gst:d:D:EU:o:I:P")) != -1)
                switch(c) {
 
                case 'D':               /* define something..*/
@@ -197,6 +199,12 @@ main(int argc, char *argv[])
                                *p++ = EOS;
                        dodefine(optarg, p);
                        break;
+               case 'E':               /* like GNU m4 1.4.9+ */
+                       if (error_warns == 0)
+                               error_warns = 1;
+                       else
+                               fatal_warns = 1;
+                       break;
                case 'I':
                        addtoincludepath(optarg);
                        break;

diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 5b7fb302ff0731a5201e3a9e258515a73176c8ac..52d122ff241e763077649da4570d57ae71ac7935 100644 (file)
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.c,v 1.46 2015/12/07 14:12:46 espie Exp $ */
+/*     $OpenBSD: misc.c,v 1.47 2017/06/15 13:48:42 bcallah Exp $       */
 /*     $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $     */
 
 /*-
@@ -386,7 +386,7 @@ xstrdup(const char *s)
 void
 usage(void)
 {
-       fprintf(stderr, "usage: m4 [-gPs] [-Dname[=value]] [-d flags] "
+       fprintf(stderr, "usage: m4 [-EgPs] [-Dname[=value]] [-d flags] "
                        "[-I dirname] [-o filename]\n"
                        "\t[-t macro] [-Uname] [file ...]\n");
        exit(1);

diff --git a/usr.bin/m4/tokenizer.l b/usr.bin/m4/tokenizer.l
index 2b4b2dba3d4f01ed08e80c405fdedfe64f929d73..593b57de7133c033cc223994a26a037aa92916b4 100644 (file)
--- a/usr.bin/m4/tokenizer.l
+++ b/usr.bin/m4/tokenizer.l
@@ -1,6 +1,6 @@
 %option nounput noinput
 %{
-/* $OpenBSD: tokenizer.l,v 1.8 2012/04/12 17:00:11 espie Exp $ */
+/* $OpenBSD: tokenizer.l,v 1.9 2017/06/15 13:48:42 bcallah Exp $ */
 /*
  * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
  *
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <limits.h>
 
+extern void m4_warnx(const char *, ...);
 extern int mimic_gnu;
 extern int32_t yylval;
 
@@ -72,7 +73,7 @@ number(void)
        l = strtol(yytext, NULL, 0);
        if (((l == LONG_MAX || l == LONG_MIN) && errno == ERANGE) ||
            l > INT32_MAX || l < INT32_MIN) {
-               fprintf(stderr, "m4: numeric overflow in expr: %s\n", yytext);
+               m4_warnx("numeric overflow in expr: %s", yytext);
        }
        return l;
 }
@@ -88,7 +89,7 @@ parse_radix(void)
        l = 0;
        base = strtol(yytext+2, &next, 0);
        if (base > 36 || next == NULL) {
-               fprintf(stderr, "m4: error in number %s\n", yytext);
+               m4_warnx("error in number %s", yytext);
        } else {
                next++;
                while (*next != 0) {
@@ -101,8 +102,7 @@ parse_radix(void)
                                d = *next - 'A' + 10;
                        }
                        if (d >= base) {
-                               fprintf(stderr, 
-                                   "m4: error in number %s\n", yytext);
+                               m4_warnx("error in number %s", yytext);
                                return 0;
                        }
                        l = base * l + d;