From owner-svn-src-head@FreeBSD.ORG  Tue Dec 14 18:23:16 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3959D10656D8;
	Tue, 14 Dec 2010 18:23:16 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 27A398FC1B;
	Tue, 14 Dec 2010 18:23:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBEING02026370;
	Tue, 14 Dec 2010 18:23:16 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBEINGUZ026368;
	Tue, 14 Dec 2010 18:23:16 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201012141823.oBEINGUZ026368@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 14 Dec 2010 18:23:16 +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: r216439 - head/usr.bin/printf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 14 Dec 2010 18:23:16 -0000

Author: delphij
Date: Tue Dec 14 18:23:15 2010
New Revision: 216439
URL: http://svn.freebsd.org/changeset/base/216439

Log:
  When printf is being used as a sh(1) builtin, it can not call
  exit(3) as pointed out by jilles@ so revert to using return(),
  also change the return value back to 1 as requested by bde@.
  
  This is logically a revert of revision 216422.

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

Modified: head/usr.bin/printf/printf.c
==============================================================================
--- head/usr.bin/printf/printf.c	Tue Dec 14 17:39:10 2010	(r216438)
+++ head/usr.bin/printf/printf.c	Tue Dec 14 18:23:15 2010	(r216439)
@@ -53,7 +53,6 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sysexits.h>
 #include <unistd.h>
 
 #ifdef SHELL
@@ -123,7 +122,7 @@ main(int argc, char *argv[])
 
 	if (argc < 1) {
 		usage();
-		/* NOTREACHED */
+		return (1);
 	}
 
 #ifdef SHELL
@@ -563,5 +562,4 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr, "usage: printf format [arguments ...]\n");
-	exit(EX_USAGE);
 }