Changes to m4/src/main.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/09/15 03:37:54

Index: src/main.c
===================================================================
RCS file: /sources/m4/m4/src/main.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- src/main.c  14 Sep 2006 00:37:26 -0000      1.81
+++ src/main.c  15 Sep 2006 03:37:54 -0000      1.82
@@ -79,6 +79,8 @@
 Operation modes:\n\
       --help                   display this help and exit\n\
       --version                output version information and exit\n\
+"), stdout);
+      fputs (_("\
   -b, --batch                  buffer output, process interrupts\n\
   -c, --discard-comments       do not copy comments to the output\n\
   -E, --fatal-warnings         stop execution after first warning\n\
@@ -86,6 +88,7 @@
   -P, --prefix-builtins        force a `m4_' prefix to all builtins\n\
   -Q, --quiet, --silent        suppress some warnings for builtins\n\
   -r, --regexp-syntax=SPEC     change the default regexp syntax\n\
+  -s, --safer                  disable potentially unsafe builtins\n\
 "), stdout);
       fputs (_("\
 \n\
@@ -172,6 +175,7 @@
   DIVERSIONS_OPTION = CHAR_MAX + 1,    /* not quite -N, because of message */
   IMPORT_ENVIRONMENT_OPTION,           /* no short opt */
   PREPEND_INCLUDE_OPTION,              /* not quite -B, because of message */
+  SAFER_OPTION,                                /* -S still has old no-op 
semantics */
 
   HELP_OPTION,                         /* no short opt */
   VERSION_OPTION                       /* no short opt */
@@ -208,6 +212,7 @@
   {"diversions", required_argument, NULL, DIVERSIONS_OPTION},
   {"import-environment", no_argument, NULL, IMPORT_ENVIRONMENT_OPTION},
   {"prepend-include", required_argument, NULL, PREPEND_INCLUDE_OPTION},
+  {"safer", no_argument, NULL, SAFER_OPTION},
 
   {"help", no_argument, NULL, HELP_OPTION},
   {"version", no_argument, NULL, VERSION_OPTION},
@@ -424,6 +429,10 @@
        import_environment = true;
        break;
 
+      case SAFER_OPTION:
+       m4_set_safer_opt (context, true);
+        break;
+
       case VERSION_OPTION:
        version_etc (stdout, PACKAGE, PACKAGE_NAME TIMESTAMP,
                     VERSION, AUTHORS, NULL);