From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id A7CDF3858407 for ; Sat, 22 Jan 2022 01:38:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A7CDF3858407 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id 187B410047D97 for ; Sat, 22 Jan 2022 01:38:07 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id B5LynH4XOXOyfB5LynEVP1; Sat, 22 Jan 2022 01:38:07 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Ot6Kdwzt c=1 sm=1 tr=0 ts=61eb5fff a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=DghFqjY3_ZEA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=mIzvRv6DCmmr1pmPYV8A:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=hml38VdpZ9jw6NCLTcZ9lhgTLLY3MMQ8wr6fT86IKho=; b=lh7Ov/qD9bgTuPYGp9v44aAfjI vRdcTwEEzp88+GUmJTs9KSexxIYEmuylo7UjR8s46UYE8PGenbFKxYDaSwPDRYza9qNrBzM7hEnwF xAkxiidqz+G+TzU1owaKmq0wQ; Received: from 75-166-128-165.hlrn.qwest.net ([75.166.128.165]:40602 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nB5Ly-001DeE-2J; Fri, 21 Jan 2022 18:38:06 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 04/19] Add puts_unfiltered method to ui_file Date: Fri, 21 Jan 2022 18:37:46 -0700 Message-Id: <20220122013801.666659-5-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220122013801.666659-1-tom@tromey.com> References: <20220122013801.666659-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.128.165 X-Source-L: No X-Exim-ID: 1nB5Ly-001DeE-2J X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-128-165.hlrn.qwest.net (prentzel.Home) [75.166.128.165]:40602 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jan 2022 01:38:09 -0000 When the pager is rewritten as a ui_file, gdb will still need a way to bypass the filtering. After examining a few approaches, I chose this patch, which adds a puts_unfiltered method to ui_file. For most implementations of ui_file, this will just delegate to puts. This patch also switches printf_unfiltered to use the new method. --- gdb/ui-file.h | 14 ++++++++++++++ gdb/utils.c | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gdb/ui-file.h b/gdb/ui-file.h index 1a010e55564..101769d73a2 100644 --- a/gdb/ui-file.h +++ b/gdb/ui-file.h @@ -109,6 +109,14 @@ class ui_file void wrap_here (int indent); + /* Print STR, bypassing any paging that might be done by this + ui_file. Note that nearly no code should call this -- it's + intended for use by printf_filtered, but nothing else. */ + virtual void puts_unfiltered (const char *str) + { + this->puts (str); + } + private: /* Helper function for putstr and putstrn. Print the character C on @@ -317,6 +325,12 @@ class tee_file : public ui_file return m_one->can_page () || m_two->can_page (); } + void puts_unfiltered (const char *str) override + { + m_one->puts_unfiltered (str); + m_two->puts_unfiltered (str); + } + private: /* The two underlying ui_files. */ ui_file *m_one; diff --git a/gdb/utils.c b/gdb/utils.c index 48d68c6739d..65b7668f583 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -2024,7 +2024,9 @@ printf_unfiltered (const char *format, ...) va_list args; va_start (args, format); - vfprintf_unfiltered (gdb_stdout, format, args); + string_file file (gdb_stdout->can_emit_style_escape ()); + file.vprintf (format, args); + gdb_stdout->puts_unfiltered (file.string ().c_str ()); va_end (args); } -- 2.31.1