From d9ff4d9af20dc120b933943d336bbee65d309b4a Mon Sep 17 00:00:00 2001 From: Grisha Levit Date: Thu, 18 Sep 2025 20:40:59 -0400 Subject: [PATCH] touch: fix diagnostic on macOS 26 * src/touch.c (touch): Do not use open_errno == EEXIST for diagnostic if file was a directory as macOS 26 sets it for open("/", O_CREAT, ...). --- src/touch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/touch.c b/src/touch.c index bc6b23840e..20b5f487b6 100644 --- a/src/touch.c +++ b/src/touch.c @@ -180,11 +180,12 @@ touch (char const *file) would give a bogus diagnostic for e.g., 'touch /' (assuming we don't own / or have write access). On Solaris 10 and probably other systems, opening a directory like "." fails with EINVAL. - (On SunOS 4 it was EPERM but that's obsolete.) */ + (On SunOS 4 it was EPERM but that's obsolete.) On macOS 26 + opening "/" fails with EEXIST. */ struct stat st; if (open_errno && ! (open_errno == EISDIR - || (open_errno == EINVAL + || ((open_errno == EINVAL || open_errno == EEXIST) && stat (file, &st) == 0 && S_ISDIR (st.st_mode)))) { /* The wording of this diagnostic should cover at least two cases: -- 2.47.3