vfs_fruit: refactor readdir_attr_macmeta() resource fork size

Move resource fork size calculation to helper functions.

Adds correct handling for the fruit:resource=stream case in
readdir_attr_rfork_size_stream(), this wasn't done previously.

Otherwise no change in behaviour.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12427

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 781b75184250e2f7115bb499a11be717d6174110..cbd1477059fab657bdf4c090451f492094f2d252 100644 (file)
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2208,12 +2208,89 @@ static bool readdir_attr_meta_finderi(struct vfs_handle_struct *handle,
        return true;
 }
 
+static uint64_t readdir_attr_rfork_size_adouble(
+       struct vfs_handle_struct *handle,
+       const struct smb_filename *smb_fname)
+{
+       struct adouble *ad = NULL;
+       uint64_t rfork_size;
+
+       ad = ad_get(talloc_tos(), handle, smb_fname->base_name,
+                   ADOUBLE_RSRC);
+       if (ad == NULL) {
+               return 0;
+       }
+
+       rfork_size = ad_getentrylen(ad, ADEID_RFORK);
+       TALLOC_FREE(ad);
+
+       return rfork_size;
+}
+
+static uint64_t readdir_attr_rfork_size_stream(
+       struct vfs_handle_struct *handle,
+       const struct smb_filename *smb_fname)
+{
+       struct smb_filename *stream_name = NULL;
+       int ret;
+       uint64_t rfork_size;
+
+       stream_name = synthetic_smb_fname(talloc_tos(),
+                                         smb_fname->base_name,
+                                         AFPRESOURCE_STREAM_NAME,
+                                         NULL, 0);
+       if (stream_name == NULL) {
+               return 0;
+       }
+
+       ret = SMB_VFS_STAT(handle->conn, stream_name);
+       if (ret != 0) {
+               TALLOC_FREE(stream_name);
+               return 0;
+       }
+
+       rfork_size = stream_name->st.st_ex_size;
+       TALLOC_FREE(stream_name);
+
+       return rfork_size;
+}
+
+static uint64_t readdir_attr_rfork_size(struct vfs_handle_struct *handle,
+                                       const struct smb_filename *smb_fname)
+{
+       struct fruit_config_data *config = NULL;
+       uint64_t rfork_size;
+
+       SMB_VFS_HANDLE_GET_DATA(handle, config,
+                               struct fruit_config_data,
+                               return 0);
+
+       switch (config->rsrc) {
+       case FRUIT_RSRC_ADFILE:
+       case FRUIT_RSRC_XATTR:
+               rfork_size = readdir_attr_rfork_size_adouble(handle,
+                                                            smb_fname);
+               break;
+
+       case FRUIT_META_STREAM:
+               rfork_size = readdir_attr_rfork_size_stream(handle,
+                                                           smb_fname);
+               break;
+
+       default:
+               DBG_ERR("Unexpected rsrc config [%d]\n", config->rsrc);
+               rfork_size = 0;
+               break;
+       }
+
+       return rfork_size;
+}
+
 static NTSTATUS readdir_attr_macmeta(struct vfs_handle_struct *handle,
                                     const struct smb_filename *smb_fname,
                                     struct readdir_attr_data *attr_data)
 {
        NTSTATUS status = NT_STATUS_OK;
-       struct adouble *ad = NULL;
        struct fruit_config_data *config = NULL;
        bool ok;
 
@@ -2230,13 +2307,10 @@ static NTSTATUS readdir_attr_macmeta(struct vfs_handle_struct *handle,
         */
 
        if (config->readdir_attr_rsize) {
-               ad = ad_get(talloc_tos(), handle, smb_fname->base_name,
-                           ADOUBLE_RSRC);
-               if (ad) {
-                       attr_data->attr_data.aapl.rfork_size = ad_getentrylen(
-                               ad, ADEID_RFORK);
-                       TALLOC_FREE(ad);
-               }
+               uint64_t rfork_size;
+
+               rfork_size = readdir_attr_rfork_size(handle, smb_fname);
+               attr_data->attr_data.aapl.rfork_size = rfork_size;
        }
 
        /*