From owner-svn-src-head@FreeBSD.ORG  Sun May 11 17:28:58 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 04B385C0;
 Sun, 11 May 2014 17:28:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E60702504;
 Sun, 11 May 2014 17:28:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BHSvTL089396;
 Sun, 11 May 2014 17:28:57 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BHSvDQ089395;
 Sun, 11 May 2014 17:28:57 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201405111728.s4BHSvDQ089395@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sun, 11 May 2014 17:28:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265885 - head/usr.bin/printf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 May 2014 17:28:58 -0000

Author: pfg
Date: Sun May 11 17:28:57 2014
New Revision: 265885
URL: http://svnweb.freebsd.org/changeset/base/265885

Log:
  printf: fix regression after illumos merges.
  
  The "bltin/bltin.h" wrappers do not support exit() and attempting
  to call it will exit sh completely.
  
  Note that errx() is acceptable but will always return with status 2.
  
  Reported by:	jilles (and the testing framework)
  Fix by:		jilles
  Pointyhat:	pfg

Modified:
  head/usr.bin/printf/printf.c

Modified: head/usr.bin/printf/printf.c
==============================================================================
--- head/usr.bin/printf/printf.c	Sun May 11 17:18:09 2014	(r265884)
+++ head/usr.bin/printf/printf.c	Sun May 11 17:28:57 2014	(r265885)
@@ -101,6 +101,8 @@ static void	 usage(void);
 
 static const char digits[] = "0123456789";
 
+static char end_fmt[1];
+
 static int  myargc;
 static char **myargv;
 static char **gargv;
@@ -171,11 +173,11 @@ main(int argc, char *argv[])
 					fmt += 2;
 				} else {
 					fmt = printf_doformat(fmt, &rval);
-					if (fmt == NULL) {
+					if (fmt == NULL || fmt == end_fmt) {
 #ifdef SHELL
 						INTON;
 #endif
-						return (1);
+						return (fmt == NULL ? 1 : rval);
 					}
 					end = 0;
 				}
@@ -372,7 +374,7 @@ printf_doformat(char *fmt, int *rval)
 		fputs(p, stdout);
 		free(p);
 		if (getout)
-			exit(*rval);
+			return (end_fmt);
 		break;
 	}
 	case 'c': {