Author: bapt
Date: Sun Apr 15 13:25:51 2012
New Revision: 234310
URL: http://svn.freebsd.org/changeset/base/234310
Log:
Improve m4 compatibility with GNU m4 extension ** (exponent)
Submitted by: Marc Espie (es...@openbsd.org)
Approved by: des@ (mentor)
Modified:
head/usr.bin/m4/eval.c
head/usr.bin/m4/extern.h
head/usr.bin/m4/main.c
Modified: head/usr.bin/m4/eval.c
==============================================================================
--- head/usr.bin/m4/eval.c Sun Apr 15 11:10:24 2012 (r234309)
+++ head/usr.bin/m4/eval.c Sun Apr 15 13:25:51 2012 (r234310)
@@ -269,10 +269,11 @@ expand_builtin(const char *argv[], int a
case INCLTYPE:
if (argc > 2)
if (!doincl(argv[2])) {
- if (mimic_gnu)
+ if (mimic_gnu) {
warn("%s at line %lu: include(%s)",
CURRENT_NAME, CURRENT_LINE,
argv[2]);
- else
+ exit_code = 1;
+ } else
err(1, "%s at line %lu: include(%s)",
CURRENT_NAME, CURRENT_LINE,
argv[2]);
}
Modified: head/usr.bin/m4/extern.h
==============================================================================
--- head/usr.bin/m4/extern.h Sun Apr 15 11:10:24 2012 (r234309)
+++ head/usr.bin/m4/extern.h Sun Apr 15 13:25:51 2012 (r234310)
@@ -87,6 +87,7 @@ extern ndptr macro_getbuiltin(const char
/* main.c */
extern void outputstr(const char *);
extern void do_emit_synchline(void);
+extern int exit_code;
#define emit_synchline() do { if (synch_lines) do_emit_synchline(); } while(0)
/* misc.c */
Modified: head/usr.bin/m4/main.c
==============================================================================
--- head/usr.bin/m4/main.c Sun Apr 15 11:10:24 2012 (r234309)
+++ head/usr.bin/m4/main.c Sun Apr 15 13:25:51 2012 (r234310)
@@ -164,6 +164,8 @@ static void enlarge_stack(void);
int main(int, char *[]);
+int exit_code = 0;
+
int
main(int argc, char *argv[])
{
@@ -282,7 +284,7 @@ main(int argc, char *argv[])
(void) fclose(outfile[0]);
}
- return 0;
+ return exit_code;
}
/*
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
