From owner-svn-src-all@FreeBSD.ORG  Sun Apr 15 13:25:52 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DF47106564A;
	Sun, 15 Apr 2012 13:25:52 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 188CD8FC15;
	Sun, 15 Apr 2012 13:25:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3FDPplm085762;
	Sun, 15 Apr 2012 13:25:51 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3FDPpsM085758;
	Sun, 15 Apr 2012 13:25:51 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201204151325.q3FDPpsM085758@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 15 Apr 2012 13:25:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234310 - head/usr.bin/m4
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Apr 2012 13:25:52 -0000

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 (espie@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;
 }
 
 /*