From patchwork Mon May 5 09:38:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 802 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (peon2454.g.dreamhost.com [208.113.200.127]) by wilcox.dreamhost.com (Postfix) with ESMTP id CF51C36007B for ; Mon, 5 May 2014 02:40:31 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14314964) id DA0EB18FA705; Mon, 5 May 2014 02:40:29 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 36852193216E for ; Mon, 5 May 2014 02:40:29 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; q=dns; s=default; b=LcnfuUqjH5Whs80GpnfcTHpHLW85JLMGhZRJgdKskNN q+gNL/u9IEf6PJ2xnCbWWI2WSJGfcFSusBCpgjUaUVgTXHArpebYFFYPey2MWANO w5Qw9PMW8xcKJdn8zHpPy3UaSv1ZOyPAHlHF2/mY/M7CxmBvPt9TruKjY1qjQsNI = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; s=default; bh=/UM4doruy7HuFa8uP2Hjm/053Cs=; b=TzwOuJjQbugY9a0lQ QDX8MKRlLXr/nW6jZvlWgN8zxEKjr4wyDOgpVA85qPDMBxnbWUbwdFk/zh08ed3D dZy2dW4t+dqbEGAm6DZ+9cCZ+xjr/9UaWlQiN0lgHb0EL9T1ypvxthuNcG88fnM4 U66MWtTeRunFlYA6kSsKltnLXA= Received: (qmail 23065 invoked by alias); 5 May 2014 09:40:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 23052 invoked by uid 89); 5 May 2014 09:40:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 05 May 2014 09:40:25 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WhFNl-0007KM-Vy from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Mon, 05 May 2014 02:40:22 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 5 May 2014 02:40:21 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Mon, 5 May 2014 02:40:20 -0700 Message-ID: <53675BFB.2020702@codesourcery.com> Date: Mon, 5 May 2014 17:38:03 +0800 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Subject: Re: [PATCH] Fix display of tabulation character for mingw hosts. References: <1399282018-8921-1-git-send-email-yao@codesourcery.com> In-Reply-To: <1399282018-8921-1-git-send-email-yao@codesourcery.com> X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in To make the patch more readable, here is the diff generated with 'git diff -b'. diff --git a/gdb/valprint.c b/gdb/valprint.c index fe23530..f55b5db 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -1949,18 +1949,10 @@ print_wchar (gdb_wint_t w, const gdb_byte *orig, int need_escape = *need_escapep; *need_escapep = 0; - if (gdb_iswprint (w) && (!need_escape || (!gdb_iswdigit (w) - && w != LCST ('8') - && w != LCST ('9')))) - { - gdb_wchar_t wchar = w; - if (w == gdb_btowc (quoter) || w == LCST ('\\')) - obstack_grow_wstr (output, LCST ("\\")); - obstack_grow (output, &wchar, sizeof (gdb_wchar_t)); - } - else - { + /* iswprint implementation on Windows returns 1 for tab character. + In order to avoid different printout on this host, we explicitly + use wchar_printable function. */ switch (w) { case LCST ('\a'): @@ -1986,6 +1978,18 @@ print_wchar (gdb_wint_t w, const gdb_byte *orig, break; default: { + if (wchar_printable (w) && (!need_escape || (!gdb_iswdigit (w) + && w != LCST ('8') + && w != LCST ('9')))) + { + gdb_wchar_t wchar = w; + + if (w == gdb_btowc (quoter) || w == LCST ('\\')) + obstack_grow_wstr (output, LCST ("\\")); + obstack_grow (output, &wchar, sizeof (gdb_wchar_t)); + } + else + { int i; for (i = 0; i + width <= orig_len; i += width)