[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/src/Attic/builtin.c,v [branch-1_4]
From: |
Eric Blake |
Subject: |
Changes to m4/src/Attic/builtin.c,v [branch-1_4] |
Date: |
Tue, 15 Aug 2006 13:51:49 +0000 |
CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 06/08/15 13:51:47
Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.31
retrieving revision 1.1.1.1.2.32
diff -u -b -r1.1.1.1.2.31 -r1.1.1.1.2.32
--- src/builtin.c 4 Aug 2006 13:19:41 -0000 1.1.1.1.2.31
+++ src/builtin.c 15 Aug 2006 13:51:47 -0000 1.1.1.1.2.32
@@ -114,7 +114,7 @@
{ "divnum", FALSE, FALSE, FALSE, m4_divnum },
{ "dnl", FALSE, FALSE, FALSE, m4_dnl },
{ "dumpdef", FALSE, FALSE, FALSE, m4_dumpdef },
- { "errprint", FALSE, FALSE, FALSE, m4_errprint },
+ { "errprint", FALSE, FALSE, TRUE, m4_errprint },
{ "esyscmd", TRUE, FALSE, TRUE, m4_esyscmd },
{ "eval", FALSE, FALSE, TRUE, m4_eval },
{ "format", TRUE, FALSE, TRUE, m4_format },
@@ -126,13 +126,13 @@
{ "indir", TRUE, FALSE, TRUE, m4_indir },
{ "len", FALSE, FALSE, TRUE, m4_len },
{ "m4exit", FALSE, FALSE, FALSE, m4_m4exit },
- { "m4wrap", FALSE, FALSE, FALSE, m4_m4wrap },
+ { "m4wrap", FALSE, FALSE, TRUE, m4_m4wrap },
{ "maketemp", FALSE, FALSE, TRUE, m4_maketemp },
{ "patsubst", TRUE, FALSE, TRUE, m4_patsubst },
{ "popdef", FALSE, FALSE, TRUE, m4_popdef },
{ "pushdef", FALSE, TRUE, TRUE, m4_pushdef },
{ "regexp", TRUE, FALSE, TRUE, m4_regexp },
- { "shift", FALSE, FALSE, FALSE, m4_shift },
+ { "shift", FALSE, FALSE, TRUE, m4_shift },
{ "sinclude", FALSE, FALSE, TRUE, m4_sinclude },
{ "substr", FALSE, FALSE, TRUE, m4_substr },
{ "syscmd", FALSE, FALSE, TRUE, m4_syscmd },
@@ -1090,6 +1090,8 @@
static void
m4_shift (struct obstack *obs, int argc, token_data **argv)
{
+ if (bad_argc (argv[0], argc, 2, -1))
+ return;
dump_args (obs, argc - 1, argv + 1, ",", TRUE);
}
@@ -1225,6 +1227,8 @@
static void
m4_errprint (struct obstack *obs, int argc, token_data **argv)
{
+ if (bad_argc (argv[0], argc, 2, -1))
+ return;
dump_args (obs, argc, argv, " ", FALSE);
obstack_1grow (obs, '\0');
fprintf (stderr, "%s", (char *) obstack_finish (obs));
@@ -1306,6 +1310,8 @@
static void
m4_m4wrap (struct obstack *obs, int argc, token_data **argv)
{
+ if (bad_argc (argv[0], argc, 2, -1))
+ return;
if (no_gnu_extensions)
obstack_grow (obs, ARG (1), strlen (ARG (1)));
else
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/08/04
- Changes to m4/src/Attic/builtin.c,v [branch-1_4],
Eric Blake <=
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/08/16
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/08/17
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/08/18
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/08/18
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/08/24