From patchwork Thu May 9 16:57:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter0x44 X-Patchwork-Id: 1933505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=aEoSw8Im; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VZyrb6Fqxz20fc for ; Fri, 10 May 2024 02:58:23 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 16881384474A for ; Thu, 9 May 2024 16:58:22 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 434E13858410 for ; Thu, 9 May 2024 16:57:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 434E13858410 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 434E13858410 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715273872; cv=none; b=fwNm4YZqixLS5+TDRhs7L5POeZ7t5PfCyBczqb61/OoSnZzAEq++LEHXbR8c5bgqrPSeJb4+DXckTP6Qvmad6LVa16WLe4pdmYqWTgE06qdgbeYNmf4HLFR7LHMfLZ3vMXkKJ4/xmlt/VsL12AfQ2b3VhEj+KQneP/3sH8BxsaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715273872; c=relaxed/simple; bh=UDA5yKq6q/xwUB/uj6DLXw/wIRutAmnnYSlc1Um+xVw=; h=From:DKIM-Signature:To:Subject:Date:Message-Id:MIME-Version; b=dDCwoHPgIZ+uSFry8rlKKBlZGyOBu6VSK4LHYByQ/wjZLdi1/dGDUmGuMzavNAJU87moXT7e9/gW6DkXC/OUDZ0PX65r7qVv2g5rnUVN0XwPFgNUX1ATpybWg0w+aTK0n4H16ky+rlb1V19fyECblr33cISkhbX0ZHNEbIV1/S8= ARC-Authentication-Results: i=1; server2.sourceware.org X-Virus-Scanned: SPAM Filter at disroot.org From: Peter Damianov DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1715273868; bh=UDA5yKq6q/xwUB/uj6DLXw/wIRutAmnnYSlc1Um+xVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aEoSw8Im0n65nPBchJ0UiiTX6fA0gw7H6BoDuCb3kJgZ5O0jRUl23oVWRCVnspQX7 laJ7HEYxL9GV+xIZbOm5QRA2ubc+MxEhRQzyMyHAWbaMD1aBu+Q0vfQyyRdH9y/Vzy 0uz7Ywd3HcU+5jFDc7JKAf6g44xrqmZI1drVcMs3i/RvBNCHjdcZg9ByrA8u28m2hw HvahtHuXOrwlonD58vLJ4RyTB0YuE02rczDrM5w/Scwj3C0EfTdNFdGSp+WuGJhGOL GMCauVIj9YwDsz2Px3aZn5sdXRBlByJCnQG+TdioUEhD/97GxJTELtVkiGWRg48RSW AOmfRXmeZ4l9g== To: gcc-patches@gcc.gnu.org Cc: lh_mouse@126.com, pexu@pexu.org, Peter Damianov Subject: [PATCH 3/3] pretty-print: Don't translate escape sequences to windows console API Date: Thu, 9 May 2024 09:57:18 -0700 Message-Id: <20240509165717.7319-3-peter0x44@disroot.org> In-Reply-To: <20240509165717.7319-1-peter0x44@disroot.org> References: <20240509165717.7319-1-peter0x44@disroot.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Modern versions of windows (after windows 10 v1511) support VT100 escape sequences, so translation for them is not necessary. The translation also mangles embedded warning documentation links. gcc/ChangeLog: * pretty-print.cc (mingw_ansi_fputs): Don't translate escape sequences if the console has ENABLE_VIRTUAL_TERMINAL_PROCESSING. Signed-off-by: Peter Damianov --- gcc/pretty-print.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/pretty-print.cc b/gcc/pretty-print.cc index eb59bf424b7..98b6410d6e4 100644 --- a/gcc/pretty-print.cc +++ b/gcc/pretty-print.cc @@ -674,8 +674,10 @@ mingw_ansi_fputs (const char *str, FILE *fp) /* Don't mess up stdio functions with Windows APIs. */ fflush (fp); - if (GetConsoleMode (h, &mode)) - /* If it is a console, translate ANSI escape codes as needed. */ + if (GetConsoleMode (h, &mode) && !(mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING)) + /* If it is a console, and doesn't support ANSI escape codes, translate + * them as needed. + */ for (;;) { if ((esc_code = find_esc_head (&prefix_len, &esc_head, read)) == 0)