From patchwork Thu Jan 11 06:22:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 187179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1260851dyi; Wed, 10 Jan 2024 22:24:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4jRT8ttOt9W96NBU+4wPYQMyPdy/S7PjCF4jnu01KjW7brWjiRctIigmwNrHn1W7sF6OY X-Received: by 2002:ad4:4eea:0:b0:680:c8a8:2eeb with SMTP id dv10-20020ad44eea000000b00680c8a82eebmr747379qvb.21.1704954257395; Wed, 10 Jan 2024 22:24:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704954257; cv=pass; d=google.com; s=arc-20160816; b=jswF6I5qiLQBtUyNAcoGtN0+qRhK6OjDMxlKTRtaOufOEEWgYBmqvRoyvs+9aWk9DX 7Lke4eos/iu+zE8cG0IBoYZuDiNMi5LKosMMjEC8v9yDG8uqrNVphq1tjhDdjfdlRlsz R6TnesIlYTLLt0aS+J5f9txdYdpHN5Z0lrVlkoXemWLOqhguuVIJ3X2m8Ooja4GlO0R+ D4wXpNKWdHg8VJjKSRW/HKirydkD6pmJQydvjq9ILWTMpCH7kZnY2YBb8kMF3UeXckeC DM6rke7e+cfz7YhNaFqLopW8k7zfaP4TFqCkw3eetcreqKGg5FBrt5UsL2Sg17DFFSuJ IjdQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:arc-filter :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=p8UMzxiwfcxm12UYyUs/PwQ1SPZ+js0deXhWiV/4CXI=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=JZfboWo19rCysXJx7wW/BFdCDkLDcHcsWS18svB9i0y6pVF9HQIKbEWJTWgZbq4JW6 evMaF48OFAxnXofeGLYKkag4V/Er0YpEQdCk+3xfgO4xZ6EwGhurR3kjBng34m3JBQqR Y3RwrdltnJeqQBUxP97VtxDjT7QBsKIPdOACkHNW591Y2Tp4wlaedtZWA5/VvEwgGR5b VhX9QZvl09iS1SS+CQuU+U6xwV9VZ7ngTUe5rXmb3QvkuhpABfZevXpmfmMVlwVYxjcY nSjEGX33hUCQBUMYTJ68rxyT3aSvjqu56XPe/Jj6NsjCMuuQ4aITpRCcpaMcxB74mPGJ mJig== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=RlBKg6Fy; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id t2-20020a0cc442000000b0067f626350a6si223075qvi.134.2024.01.10.22.24.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 22:24:17 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=RlBKg6Fy; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 15959385800A for ; Thu, 11 Jan 2024 06:24:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15959385800A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704954257; bh=p8UMzxiwfcxm12UYyUs/PwQ1SPZ+js0deXhWiV/4CXI=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=RlBKg6FyfMhAu1QwluzIGqXJtyJTLQlBFqsLprWY9h1CO5gvh5d0Nh/xKSpC6lLlc hWv72Uos82FnqqsjxnVlC77IJok98NVVW14Knz4E1kov2ztlhaGyS/uY956O43U0NB oX8jZYFdnPB6B2VO1x+A7LCHuBQVzQF8Z029G4/k= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id 51C423858D38; Thu, 11 Jan 2024 06:23:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 51C423858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 51C423858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704954185; cv=none; b=R7FkX9T8bfeb7XoCBZ0ljdCnsWnynnosy0vM/CBCqsp4bwQvvc1zg6PKB0izGg3B9LPIzljgaN3tU+Ypckw0VjlhnJLJ01kWIXRFw/i91fgeStRMLDcUzPg2CCCkjucqvl1BseA7GscCOCfQzzhVD2Q4AnD8drfLvQLWMj4hGQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704954185; c=relaxed/simple; bh=5LH7WhbX7V5lgYi2E2I4zJAULLGR5DNFslpOdcue6A4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=sRY/kbiXoHfBGy+Uz7CrSieMylH2+TbednWlwP9qCUnGp9FtqJj54HWNY1iD6FkioUGJrqnwaDxiv3Dq8fOMNHv/vx+5hRAwEaYY8D1HfT8MtCDWfhLyEQlR20pdUHdMcTqYVMXm30A0bi0aeUowMqVITuANrmTGPGQn+K7CDAo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247472.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40B6LSgk030839; Thu, 11 Jan 2024 06:23:01 GMT Received: from mxout24.cac.washington.edu (mxout24.cac.washington.edu [140.142.234.158]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3vj4jraaa3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Jan 2024 06:23:01 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout24.cac.washington.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 40B6MWLh015859 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 10 Jan 2024 22:22:32 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.143]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 40B6MWMg001875 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Jan 2024 22:22:32 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH] libstdc++: Fix error handling for std::filesystem::equivalent [PR113250] Date: Wed, 10 Jan 2024 22:22:22 -0800 Message-ID: <20240111062222.525186-1-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Proofpoint-GUID: KiSzyTeUA9TtkMLNx3LBG3PrEJvKt66A X-Proofpoint-ORIG-GUID: KiSzyTeUA9TtkMLNx3LBG3PrEJvKt66A X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-11_02,2024-01-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=0 mlxlogscore=856 priorityscore=1501 mlxscore=0 clxscore=1034 adultscore=0 impostorscore=0 spamscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401110049 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787774115313352116 X-GMAIL-MSGID: 1787774115313352116 This patch made std::filesystem::equivalent correctly throw an exception when either path does not exist as per [fs.op.equivalent]/4. libstdc++-v3/ChangeLog: * src/c++17/fs_ops.cc (equivalent): Use || instead of &&. * testsuite/27_io/filesystem/operations/equivalent.cc: Handle error codes. Signed-off-by: Ken Matsui --- libstdc++-v3/src/c++17/fs_ops.cc | 2 +- .../testsuite/27_io/filesystem/operations/equivalent.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index e0b308a37ea..61df19753ef 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -897,7 +897,7 @@ fs::equivalent(const path& p1, const path& p2, error_code& ec) noexcept return st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino; #endif } - else if (!exists(s1) && !exists(s2)) + else if (!exists(s1) || !exists(s2)) ec = std::make_error_code(std::errc::no_such_file_or_directory); else if (err) ec.assign(err, std::generic_category()); diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc index 78f6e368204..68f32366d65 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc @@ -34,13 +34,13 @@ test01() bool result; result = equivalent(p1, p2, ec); - VERIFY( ec ); + VERIFY( ec == std::errc::no_such_file_or_directory ); VERIFY( !result ); __gnu_test::scoped_file f1(p1); ec = bad_ec; result = equivalent(p1, p2, ec); - VERIFY( !ec ); + VERIFY( ec == std::errc::no_such_file_or_directory ); VERIFY( !result ); __gnu_test::scoped_file f2(p2);