libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preserving non-userspace xattr if all userspace shall be overwritten.

Browse Source
This commit is contained in:
Thomas Schmitt 2009-02-13 18:45:53 +01:00
parent 1b3f5186e7
commit 22e45ed489
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libisofs/libisofs.h
View File

@ -4435,7 +4435,8 @@ int iso_node_get_attrs(IsoNode *node, size_t *num_attrs,
* bit2= Delete the attributes with the given names * bit2= Delete the attributes with the given names
* bit3= Allow non-user attribute. * bit3= Allow non-user attribute.
* I.e. those with a non-empty name which does not begin by "user." * I.e. those with a non-empty name which does not begin by "user."
* (The empty name is always allowed and governed by bit0.) * (The empty name is always allowed and governed by bit0.) This
* deletes all previously existing attributes if not bit1 is set.
* @return * @return
* 1 = ok * 1 = ok
* < 0 = error * < 0 = error

31
libisofs/node.c
View File

@ -1524,7 +1524,10 @@ int attr_enlarge_list(char ***names, size_t **value_lengths, char ***values,
attribute list returned by m_* parameters. attribute list returned by m_* parameters.
The m_* paramters have finally to be freed by a call with bit15 set. The m_* paramters have finally to be freed by a call with bit15 set.
@param flag Bitfield for control purposes @param flag Bitfield for control purposes
bit2= delete rather than overwrite bit0= delete all old names which begin by "user."
(but not if bit2 is set)
bit2= delete the given names rather than overwrite
their content
bit15= release memory and return 1 bit15= release memory and return 1
*/ */
static static
@ -1547,6 +1550,26 @@ int iso_node_merge_xattr(IsoNode *node, size_t num_attrs, char **names,
if (ret < 0) if (ret < 0)
return ret; return ret;
if ((flag & 1) && (!(flag & 4))) {
/* Delete unmatched user space pairs */
for (j = 0; j < *m_num_attrs; j++) {
if (strncmp((*m_names)[j], "user.", 5) != 0)
continue;
for (i = 0; i < num_attrs; i++) {
if (names[i] == NULL || (*m_names)[j] == NULL)
continue;
if (strcmp(names[i], (*m_names)[j]) == 0)
break;
}
if (i >= num_attrs) {
/* Delete unmatched pair */
free((*m_names)[j]);
(*m_names)[j] = NULL;
deleted++;
}
}
}
/* Handle existing names, count non-existing names */ /* Handle existing names, count non-existing names */
for (i = 0; i < num_attrs; i++) { for (i = 0; i < num_attrs; i++) {
for (j = 0; j < *m_num_attrs; j++) { for (j = 0; j < *m_num_attrs; j++) {
@ -1576,6 +1599,7 @@ int iso_node_merge_xattr(IsoNode *node, size_t num_attrs, char **names,
if (j >= *m_num_attrs) if (j >= *m_num_attrs)
new_names++; new_names++;
} }
if (new_names > 0 && (flag & 4)) { if (new_names > 0 && (flag & 4)) {
/* >>> warn of non-existing name on delete ? */; /* >>> warn of non-existing name on delete ? */;
@ -1647,11 +1671,12 @@ int iso_node_set_attrs(IsoNode *node, size_t num_attrs, char **names,
if (!(flag & 1)) if (!(flag & 1))
iso_node_get_acl_text(node, &a_acl, &d_acl, 16); iso_node_get_acl_text(node, &a_acl, &d_acl, 16);
if (flag & (2 | 4)) { if ((flag & (2 | 4)) || !(flag & 8)) {
/* Merge old and new lists */ /* Merge old and new lists */
ret = iso_node_merge_xattr( ret = iso_node_merge_xattr(
node, num_attrs, names, value_lengths, values, node, num_attrs, names, value_lengths, values,
&m_num, &m_names, &m_value_lengths, &m_values, flag & 4); &m_num, &m_names, &m_value_lengths, &m_values,
(flag & 4) | !(flag & 2));
if (ret < 0) if (ret < 0)
goto ex; goto ex;
num_attrs = m_num; num_attrs = m_num;