From owner-svn-src-head@freebsd.org  Wed Aug  8 15:12:33 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BE10105EC97;
 Wed,  8 Aug 2018 15:12:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3D22E81AA6;
 Wed,  8 Aug 2018 15:12:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1ECF645D3;
 Wed,  8 Aug 2018 15:12:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w78FCXsO030336;
 Wed, 8 Aug 2018 15:12:33 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w78FCXc2030335;
 Wed, 8 Aug 2018 15:12:33 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201808081512.w78FCXc2030335@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 8 Aug 2018 15:12:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r337457 - head/usr.bin/printf
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/usr.bin/printf
X-SVN-Commit-Revision: 337457
X-SVN-Commit-Repository: base
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.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2018 15:12:33 -0000

Author: pfg
Date: Wed Aug  8 15:12:32 2018
New Revision: 337457
URL: https://svnweb.freebsd.org/changeset/base/337457

Log:
  Revert r337440: the log message is wrong.

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

Modified: head/usr.bin/printf/printf.c
==============================================================================
--- head/usr.bin/printf/printf.c	Wed Aug  8 15:08:22 2018	(r337456)
+++ head/usr.bin/printf/printf.c	Wed Aug  8 15:12:32 2018	(r337457)
@@ -1,7 +1,6 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright 2018 Staysail Systems, Inc. <info@staysail.tech>
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
  * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 1989, 1993
@@ -376,19 +375,16 @@ printf_doformat(char *fmt, int *rval)
 		char *p;
 		int getout;
 
-		/* Convert "b" to "s" for output. */
-		start[strlen(start) - 1] = 's';
-		if ((p = strdup(getstr())) == NULL) {
+		p = strdup(getstr());
+		if (p == NULL) {
 			warnx("%s", strerror(ENOMEM));
 			return (NULL);
 		}
 		getout = escape(p, 0, &len);
-		PF(start, p);
-		/* Restore format for next loop. */
-
+		fputs(p, stdout);
 		free(p);
 		if (getout)
-			exit(*rval);
+			return (end_fmt);
 		break;
 	}
 	case 'c': {