sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

vfs_fruit: let the ad_convert_*() subfunction update the on-disk AppleDoube header as needed

Browse Source 
Another step in simplifying ad_convert() itself. It means that we may
write to disk twice, but is only ever done once per AppleDouble file.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13649

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2018-10-05 17:07:45 +02:00
parent 918c6c5990
commit 1692ca5fd8
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source3/modules/vfs_fruit.c
View File

@ -949,6 +949,7 @@ static bool ad_convert_xattr(struct adouble *ad,
char *map = MAP_FAILED; char *map = MAP_FAILED;
size_t maplen; size_t maplen;
uint16_t i; uint16_t i;
ssize_t len;
int saved_errno = 0; int saved_errno = 0;
NTSTATUS status; NTSTATUS status;
int rc; int rc;
@ -1073,6 +1074,20 @@ static bool ad_convert_xattr(struct adouble *ad,
} }
ad_setentrylen(ad, ADEID_FINDERI, ADEDLEN_FINDERI); ad_setentrylen(ad, ADEID_FINDERI, ADEDLEN_FINDERI);
ok = ad_pack(ad);
if (!ok) {
DBG_WARNING("ad_pack [%s] failed\n", smb_fname->base_name);
goto fail;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
DBG_ERR("%s: bad size: %zd\n", smb_fname->base_name, len);
ok = false;
goto fail;
}
ok = true; ok = true;
fail: fail:
@ -1204,7 +1219,9 @@ static bool ad_convert_move_reso(struct adouble *ad,
{ {
char *map = MAP_FAILED; char *map = MAP_FAILED;
size_t maplen; size_t maplen;
ssize_t len;
int rc; int rc;
bool ok;
if (ad_getentrylen(ad, ADEID_RFORK) == 0) { if (ad_getentrylen(ad, ADEID_RFORK) == 0) {
return true; return true;
@ -1233,6 +1250,18 @@ static bool ad_convert_move_reso(struct adouble *ad,
ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_DOT_UND); ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_DOT_UND);
ok = ad_pack(ad);
if (!ok) {
DBG_WARNING("ad_pack [%s] failed\n", smb_fname->base_name);
return false;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
DBG_ERR("%s: bad size: %zd\n", smb_fname->base_name, len);
return false;
}
return true; return true;
} }
@ -1248,7 +1277,6 @@ static bool ad_convert_move_reso(struct adouble *ad,
static int ad_convert(struct adouble *ad, static int ad_convert(struct adouble *ad,
const struct smb_filename *smb_fname) const struct smb_filename *smb_fname)
{ {
ssize_t len;
bool ok; bool ok;
if (ad_getentrylen(ad, ADEID_FINDERI) == ADEDLEN_FINDERI) { if (ad_getentrylen(ad, ADEID_FINDERI) == ADEDLEN_FINDERI) {
@ -1270,18 +1298,6 @@ static int ad_convert(struct adouble *ad,
return -1; return -1;
} }
ok = ad_pack(ad);
if (!ok) {
DBG_WARNING("ad_pack [%s] failed\n", smb_fname->base_name);
return -1;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
DBG_ERR("%s: bad size: %zd\n", smb_fname->base_name, len);
return -1;
}
ok = ad_convert_finderinfo(ad, smb_fname); ok = ad_convert_finderinfo(ad, smb_fname);
if (!ok) { if (!ok) {
DBG_ERR("Failed to convert [%s]\n", DBG_ERR("Failed to convert [%s]\n",