diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-11-12 07:17:11 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-11-12 07:17:11 +0100 |
| commit | fc00fe53e189df04e6325e4f19edcb0c8612600f (patch) | |
| tree | 28c881b7067e630b820299b027846c428a4b0c8d /src/w32.c | |
| parent | 070d6297ca468b197744c94df0c17fb09f47f67a (diff) | |
| parent | a6905e90cc3358a21726646c4ee9154e80fc96d6 (diff) | |
| download | emacs-fc00fe53e189df04e6325e4f19edcb0c8612600f.tar.gz emacs-fc00fe53e189df04e6325e4f19edcb0c8612600f.tar.bz2 emacs-fc00fe53e189df04e6325e4f19edcb0c8612600f.zip | |
Merge from origin/emacs-28
a6905e90cc Fix problem with temp buffer killing in package-install-file
144ad77fda Fix Lisp Intro markup error
24b86cb4f7 Fix ACL errors with WebDAV volumes on MS-Windows
Diffstat (limited to 'src/w32.c')
| -rw-r--r-- | src/w32.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/w32.c b/src/w32.c index e4b7ef3b95d..2b2f8aadf6b 100644 --- a/src/w32.c +++ b/src/w32.c @@ -6548,7 +6548,8 @@ acl_get_file (const char *fname, acl_type_t type) xfree (psd); err = GetLastError (); if (err == ERROR_NOT_SUPPORTED - || err == ERROR_ACCESS_DENIED) + || err == ERROR_ACCESS_DENIED + || err == ERROR_INVALID_FUNCTION) errno = ENOTSUP; else if (err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND @@ -6567,10 +6568,11 @@ acl_get_file (const char *fname, acl_type_t type) || err == ERROR_INVALID_NAME) errno = ENOENT; else if (err == ERROR_NOT_SUPPORTED - /* ERROR_ACCESS_DENIED is what we get for a volume - mounted by WebDAV, which evidently doesn't - support ACLs. */ - || err == ERROR_ACCESS_DENIED) + /* ERROR_ACCESS_DENIED or ERROR_INVALID_FUNCTION is + what we get for a volume mounted by WebDAV, + which evidently doesn't support ACLs. */ + || err == ERROR_ACCESS_DENIED + || err == ERROR_INVALID_FUNCTION) errno = ENOTSUP; else errno = EIO; |