From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jwakely@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124])
 by sourceware.org (Postfix) with ESMTP id D84D2389443B
 for <libstdc++@gcc.gnu.org>; Thu, 11 Mar 2021 18:21:00 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D84D2389443B
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-43-bp8wu1oxNh2LoHMCKzC8OQ-1; Thu, 11 Mar 2021 13:20:58 -0500
X-MC-Unique: bp8wu1oxNh2LoHMCKzC8OQ-1
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B211107ACCD;
 Thu, 11 Mar 2021 18:20:57 +0000 (UTC)
Received: from localhost (unknown [10.33.36.30])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 23B0A1037EB2;
 Thu, 11 Mar 2021 18:20:56 +0000 (UTC)
Date: Thu, 11 Mar 2021 18:20:56 +0000
From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: Re: [committed] libstdc++: Handle EPERM for filesystem access errors
 on MacOS [PR 99537]
Message-ID: <20210311182056.GI3008@redhat.com>
References: <YEpZN45U5vyamlfq@redhat.com>
MIME-Version: 1.0
In-Reply-To: <YEpZN45U5vyamlfq@redhat.com>
X-Clacks-Overhead: GNU Terry Pratchett
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH,
 DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW,
 RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS,
 TXREP autolearn=ham autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: libstdc++@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++ mailing list <libstdc++.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++>,
 <mailto:libstdc++-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++/>
List-Post: <mailto:libstdc++@gcc.gnu.org>
List-Help: <mailto:libstdc++-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++>,
 <mailto:libstdc++-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Mar 2021 18:21:11 -0000

On 11/03/21 17:54 +0000, Jonathan Wakely wrote:
>Contrary to what POSIX says, some directory operations on MacOS can fail
>with EPERM instead of EACCES, so we need to handle both.
>
>libstdc++-v3/ChangeLog:
>
>	PR libstdc++/99537

Oh drat, that's the wrong PR number. It should be PR 99533, as the
comment says in the code. I'll fix the ChangeLog tomorrow.

>	* src/c++17/fs_dir.cc (recursive_directory_iterator): Use new
>	helper function to check for permission denied errors.
>	* src/filesystem/dir.cc (recursive_directory_iterator):
>	Likewise.
>	* src/filesystem/dir-common.h (is_permission_denied_error): New
>	helper function.



>--- a/libstdc++-v3/src/filesystem/dir-common.h
>+++ b/libstdc++-v3/src/filesystem/dir-common.h
>@@ -141,6 +141,18 @@ struct _Dir_base
>   posix::DIR*	dirp;
> };
>
>+inline bool
>+is_permission_denied_error(int e)
>+{
>+  if (e == EACCES)
>+    return true;
>+#ifdef __APPLE__
>+  if (e == EPERM) // See PR 99533
>+    return true;
>+#endif
>+  return false;
>+}
>+
> } // namespace filesystem
>
> // BEGIN/END macros must be defined before including this file.