From nobody Wed Jun 25 01:14:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bRkPR2THtz60WY2; Wed, 25 Jun 2025 01:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRkPR1Dtlz3jtN; Wed, 25 Jun 2025 01:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750814075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZfMNtLB/jmxS7q8cMook/cv7+I7G5W5r4fsY4LpB6Y=; b=p20O9AjGgUdPEjcOqNKapRcd3kWUVN35oc+outd811idPlDVjoMW50CxSYrtZLTrPm+g6s RbcxwXdR5lBfRUgNaLkCPbd7TjTJwvt511Z4Ek+MAbqGHkjwGIgx166tsxhlhWYtihfCdz y0uiP+M66HeDKLjBPvajYs6aBDioLQD+U439GY36zJxF4xQ4rlWfDlMmsQ686jEAHUKX7c NcBTLPEL2Bf6gxep+gtLwe+mk9s/jut5vLaka3r4CjuyXRKoS2eCyy3AkRMtI9/dXzQQYt 9bzwMKiQBTxuTpOe4xraeEoxzMNcAs4EIFyRM0rssn0tXc2XTQ/LTWVQnYlWrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750814075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZfMNtLB/jmxS7q8cMook/cv7+I7G5W5r4fsY4LpB6Y=; b=TDqhXwTvN8vFXdkTg49sCWewdwaReDMhg2zjfJQ95rWnvqVYdLYmZ+aKyT6IgrV+Uf/CNQ n2SnnTIQvp4AfJPd1cwSAe+q3CGx/10TXXWmpV0Vg28Hj9IVDXKzZOrSFN6z4V9+pCOP1/ TCGy96vXI2UGpNc79y1OpT7L1AcQa30fKAhcYGn2soyg3trD2ojts03USLH0gOQFV8yTib EFT34tj6TPMh+ERK/VCjvY2RjbgSDj6WlqwVTNTuoKeJ3kAQp9kb0EGWkvhPdJAoSRV2jt uDTvWuhyhAUuFC2zHQ0AOrSCjUwWfQH3LiMzRyFyKjGj3uo0lECcyVgbqhJCRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750814075; a=rsa-sha256; cv=none; b=yVST2LJGuA2B6NhsmAyOq1oYSA0PtsgrStwruoldpeNA0I5dV/FKwJtZ4RmAYWd8IwVhRW c5SOJT5LgxTSYrzeFuZJuZT8HIAcPdiDPOpGKkGi/Og1IBL78wBqf3Yc8nJlClWwzqW5S6 BS0oQov7v8OyFvzC4lh49tqLDbbwT7Tn3u5oBqf3jxJThrd1a5hHk4D2uJBPGTH/rXF3Dc RSW1I3Icf0JETdIJWefmHzeX2Wb3MF3VOwvEbXRdiehnbNbmTCwB/2trnp8LstdNn39iZg cA/011MfVNl1QchHhQKSdsKPPE6SBrW4xNMyDMv6mA0scSaR66x9u2wdDeq7uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bRkPR0dBLz1B5Y; Wed, 25 Jun 2025 01:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55P1EZ3w056005; Wed, 25 Jun 2025 01:14:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55P1EZr2056002; Wed, 25 Jun 2025 01:14:35 GMT (envelope-from git) Date: Wed, 25 Jun 2025 01:14:35 GMT Message-Id: <202506250114.55P1EZr2056002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 96a241a35905 - main - bsddialog: in textbox mode differentiate between Exit and Extra buttons List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96a241a35905078bdc5d20bf25943cdb67758dea Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=96a241a35905078bdc5d20bf25943cdb67758dea commit 96a241a35905078bdc5d20bf25943cdb67758dea Author: Maksim Yevmenkin AuthorDate: 2025-06-25 01:13:38 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-25 01:13:38 +0000 bsddialog: in textbox mode differentiate between Exit and Extra buttons If run --extra-button --textbox dialog will have two buttons, but either of them would return 0 exit status. We definitely want the Extra to report its value. Reviewed by: jlduran, asiciliano Differential Revision: https://reviews.freebsd.org/D48668 --- contrib/bsddialog/lib/textbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/bsddialog/lib/textbox.c b/contrib/bsddialog/lib/textbox.c index 597dc6c8187b..ca3eb69fff52 100644 --- a/contrib/bsddialog/lib/textbox.c +++ b/contrib/bsddialog/lib/textbox.c @@ -200,7 +200,7 @@ bsddialog_textbox(struct bsddialog_conf *conf, const char *file, int rows, switch(input) { case KEY_ENTER: case 10: /* Enter */ - retval = BSDDIALOG_OK; + retval = BUTTONVALUE(d.bs); loop = false; break; case 27: /* Esc */