diff options
| author | Ralph Boehme <slow@samba.org> | 2019-05-21 11:39:18 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-06-21 07:56:19 +0000 |
| commit | 18c45bb3440d5e54c2d4380a94317f0ac40e67b2 (patch) | |
| tree | b6a9abfa7ba56ca03d6604b611a444251c22ebf0 | |
| parent | c3676d8d42b2b6acc4d68acae69df18ff04b2b5f (diff) | |
| download | samba-18c45bb3440d5e54c2d4380a94317f0ac40e67b2.tar.gz | |
vfs_fruit: add and use is_adouble_file()
This adds a helper function that checks whether the last component of a path is
an AppleDouble sidecar file with "._" name prefix.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit ad70c947c759aa0965ee57f973fb8dc1909e0e39)
| -rw-r--r-- | source3/modules/vfs_fruit.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 0c32c1e19b3..0e36c285308 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -2172,6 +2172,27 @@ static bool is_apple_stream(const struct smb_filename *smb_fname) return false; } +static bool is_adouble_file(const char *path) +{ + const char *p = NULL; + int match; + + p = strrchr(path, '/'); + if (p == NULL) { + p = path; + } else { + p++; + } + + match = strncmp(p, + ADOUBLE_NAME_PREFIX, + strlen(ADOUBLE_NAME_PREFIX)); + if (match != 0) { + return false; + } + return true; +} + /** * Initialize config struct from our smb.conf config parameters **/ @@ -4204,16 +4225,12 @@ static int fruit_rmdir(struct vfs_handle_struct *handle, } while ((de = SMB_VFS_READDIR(handle->conn, dh, NULL)) != NULL) { - int match; struct adouble *ad = NULL; char *p = NULL; struct smb_filename *ad_smb_fname = NULL; int ret; - match = strncmp(de->d_name, - ADOUBLE_NAME_PREFIX, - strlen(ADOUBLE_NAME_PREFIX)); - if (match != 0) { + if (!is_adouble_file(de->d_name)) { continue; } |