summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGene C <arch@sapience.com>2023-10-02 22:42:26 +0200
committerChristian Brabandt <cb@256bit.org>2023-10-02 22:44:12 +0200
commit993b17569b5acffe2d8941d1709a55da4e439755 (patch)
tree499961578408a29fd3dab8ddd50adb939543abe9
parent12a0d999b140cb5bf08bf9f416f2bc9bb8a12fc9 (diff)
patch 9.0.1975: xattr: permission-denied errors on writev9.0.1975
Problem: xattr: permission-denied errors on write Solution: ignore those errors closes: #13246 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Gene C <arch@sapience.com>
-rw-r--r--src/errors.h4
-rw-r--r--src/os_unix.c5
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/errors.h b/src/errors.h
index bb807e7d56..8175892881 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3554,12 +3554,10 @@ EXTERN char e_invalid_format_specifier_str[]
INIT(= N_("E1505: Invalid format specifier: %s"));
EXTERN char e_xattr_erange[]
INIT(= N_("E1506: Buffer too small to copy xattr value or key"));
-EXTERN char e_xattr_enotsup[]
- INIT(= N_("E1507: Extended attributes are not supported by the filesystem"));
EXTERN char e_xattr_e2big[]
INIT(= N_("E1508: Size of the extended attribute value is larger than the maximum size allowed"));
EXTERN char e_xattr_other[]
INIT(= N_("E1509: Error occured when reading or writing extended attribute"));
-// E1509 - E1519 unused
+// E1507, E1509 - E1519 unused
EXTERN char e_aptypes_is_null_nr_str[]
INIT(= "E1520: Internal error: ap_types or ap_types[idx] is NULL: %d: %s");
diff --git a/src/os_unix.c b/src/os_unix.c
index 9356db0b75..237171b4fa 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3154,8 +3154,9 @@ mch_copy_xattr(char_u *from_file, char_u *to_file)
errmsg = e_xattr_e2big;
goto error_exit;
case ENOTSUP:
- errmsg = e_xattr_enotsup;
- goto error_exit;
+ case EACCES:
+ case EPERM:
+ break;
case ERANGE:
errmsg = e_xattr_erange;
goto error_exit;
diff --git a/src/version.c b/src/version.c
index b46d20c2c8..9022edb535 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1975,
+/**/
1974,
/**/
1973,