From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by sourceware.org (Postfix) with ESMTPS id 6DB873836831 for ; Thu, 17 Nov 2022 16:44:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6DB873836831 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foss.st.com Received: from pps.filterd (m0288072.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AHElxnj009059; Thu, 17 Nov 2022 17:44:48 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=message-id : date : mime-version : subject : from : to : cc : references : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=ioi8RuRxPm4ptIYR02uQ7loNcNF2Q/IxY8IsCLURbew=; b=Zo7CTK8LSqXYpPjEFGq/mjywcPt0s9A3dZxtn6KIK7dbbTDd7HWN/gSOqMN/wTMfbF2D ntYY0Ujq2/asbqlj0YSHVeYHNqju4iSUfEQegiv5i5oGKVcl/DaLs3JoiKDjHy50nKgJ IYoOuLfzJdsxEtpg6ltEGob9Mh6+9nHOhvQ6FRbMVQxaz7IQW3fvLzxW9+lr6m/zRwGw d9WjLNCU9gJEAn2MRjZ49yA1yV4AM+uFBETTlgHQBF5uAnI9pLXPXhn9rnvCzRlylTZA mRlAL9R98GlP6rqea6dtnl9dhfFxmCZaZkROAOiMQZmV/4bRCbtgV/1+7q3vNkQn2kj1 qA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3kwjvkvubc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Nov 2022 17:44:48 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 3EB2C10002A; Thu, 17 Nov 2022 17:44:43 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 38A7523692D; Thu, 17 Nov 2022 17:44:43 +0100 (CET) Received: from [10.210.55.83] (10.210.55.83) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.6; Thu, 17 Nov 2022 17:44:42 +0100 Message-ID: <8f93e61d-ad2e-7638-f113-93616ba498a6@foss.st.com> Date: Thu, 17 Nov 2022 17:44:42 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: PING^2 [PATCH] cpp/remap: Only override if string matched Content-Language: en-US From: Torbjorn SVENSSON To: CC: , Tom Tromey References: <20221020204825.3248771-1-torbjorn.svensson@foss.st.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.210.55.83] X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-17_06,2022-11-17_01,2022-06-22_01 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_LOW,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 List-Id: Hi, Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-November/604898.html Ok for trunk? Kind regards, Torbjörn On 2022-11-02 19:21, Torbjorn SVENSSON wrote: > Hi, > > Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604062.html > > Ok for trunk? > > Kind regards, > Torbjörn > > On 2022-10-20 22:48, Torbjörn SVENSSON wrote: >> For systems with HAVE_DOS_BASED_FILE_SYSTEM set, only override the >> pointer if the backslash pattern matches. >> >> Output without this patch: >> .../gcc/testsuite/gcc.dg/cpp/pr71681-2.c:5:10: fatal error: a/t2.h: No >> such file or directory >> >> With patch applied, no output and the test case succeeds. >> >> libcpp/ChangeLog >> >>     * files.cc: Ensure pattern matches before use. >> >> Signed-off-by: Torbjörn SVENSSON >> --- >>   libcpp/files.cc | 2 +- >>   1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libcpp/files.cc b/libcpp/files.cc >> index 24208f7b0f8..a18b1caf48d 100644 >> --- a/libcpp/files.cc >> +++ b/libcpp/files.cc >> @@ -1833,7 +1833,7 @@ remap_filename (cpp_reader *pfile, _cpp_file *file) >>   #ifdef HAVE_DOS_BASED_FILE_SYSTEM >>         { >>       const char *p2 = strchr (fname, '\\'); >> -    if (!p || (p > p2)) >> +    if (!p || (p2 && p > p2)) >>         p = p2; >>         } >>   #endif