luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 15:33:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

gfileinfo: Implement xattr attribute removal

Browse Source 
Fixes: #1187
This commit is contained in:
madmurphy
2022-07-26 07:58:32 +00:00
committed by Philip Withnall
parent f839eae274
commit b295c53769
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gio/glocalfileinfo.c
View File

@@ -261,10 +261,12 @@ get_selinux_context (const char *path,
#define g_fgetxattr(fd,name,value,size) fgetxattr(fd,name,value,size,0,0)
#define g_flistxattr(fd,name,size) flistxattr(fd,name,size,0)
#define g_setxattr(path,name,value,size) setxattr(path,name,value,size,0,0)
#define g_removexattr(path,name) removexattr(path,name,0)
#else
#define g_fgetxattr fgetxattr
#define g_flistxattr flistxattr
#define g_setxattr(path,name,value,size) setxattr(path,name,value,size,0)
#define g_removexattr(path,name) removexattr(path,name)
#endif
static gssize
@@ -774,10 +776,10 @@ set_xattr (char *filename,
return FALSE;
}
if (attr_value->type != G_FILE_ATTRIBUTE_TYPE_STRING)
if (attr_value->type != G_FILE_ATTRIBUTE_TYPE_STRING && attr_value->type != G_FILE_ATTRIBUTE_TYPE_INVALID)
{
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid attribute type (string expected)"));
_("Invalid attribute type (string or invalid expected)"));
return FALSE;
}
@@ -799,16 +801,27 @@ set_xattr (char *filename,
escaped_attribute += strlen ("xattr-sys::");
is_user = FALSE;
}
attribute = hex_unescape_string (escaped_attribute, NULL, &free_attribute);
value = hex_unescape_string (attr_value->u.string, &val_len, &free_value);
if (is_user)
a = g_strconcat ("user.", attribute, NULL);
else
a = attribute;
res = g_setxattr (filename, a, value, val_len);
if (attr_value->type == G_FILE_ATTRIBUTE_TYPE_STRING)
{
value = hex_unescape_string (attr_value->u.string, &val_len, &free_value);
res = g_setxattr (filename, a, value, val_len);
}
else
{
value = NULL;
val_len = 0;
free_value = FALSE;
res = g_removexattr (filename, a);
}
errsv = errno;
if (is_user)