From patchwork Tue May 15 06:37:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 10400049 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D1F44600F4 for ; Tue, 15 May 2018 06:37:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A52BA28646 for ; Tue, 15 May 2018 06:37:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A02528673; Tue, 15 May 2018 06:37:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53C9128646 for ; Tue, 15 May 2018 06:37:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752374AbeEOGhW (ORCPT ); Tue, 15 May 2018 02:37:22 -0400 Received: from orcrist.hmeau.com ([104.223.48.154]:45628 "EHLO deadmen.hmeau.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752414AbeEOGhV (ORCPT ); Tue, 15 May 2018 02:37:21 -0400 Received: from gondobar.mordor.me.apana.org.au ([192.168.128.4] helo=gondobar) by deadmen.hmeau.com with esmtps (Exim 4.89 #2 (Debian)) id 1fITaJ-0005Vf-Ij for ; Tue, 15 May 2018 14:37:19 +0800 Received: from herbert by gondobar with local (Exim 4.89) (envelope-from ) id 1fITaI-0000VG-Gw; Tue, 15 May 2018 14:37:18 +0800 Subject: [v2 PATCH 7/12] output: Fix fmtstr return value References: <20180515063602.u6jdebjzcr6ve2dh@gondor.apana.org.au> To: DASH Mailing List Message-Id: From: Herbert Xu Date: Tue, 15 May 2018 14:37:18 +0800 Sender: dash-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dash@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function fmtstr is meant to return the actual length of output produced, rather than the untruncated length. Signed-off-by: Herbert Xu --- src/output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe dash" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/output.c b/src/output.c index 4d3b4c2..34243ea 100644 --- a/src/output.c +++ b/src/output.c @@ -286,7 +286,7 @@ fmtstr(char *outbuf, size_t length, const char *fmt, ...) va_start(ap, fmt); ret = xvsnprintf(outbuf, length, fmt, ap); va_end(ap); - return ret; + return ret > (int)length ? length : ret; }