X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fmodules%2Fonefs_streams.c;h=ded7dc672d44e3e5d91ec1dfe5862d8848bd8f00;hb=161e182b65ceda833e0bebc48ef404cdd399f8d7;hp=d33d9f30a2c5f602eef6370dc742084ff18f1850;hpb=1a1d10d22f7a2eebd22e76614c3c74b4d49e5c33;p=samba.git diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c index d33d9f30a2c..ded7dc672d4 100644 --- a/source3/modules/onefs_streams.c +++ b/source3/modules/onefs_streams.c @@ -25,35 +25,6 @@ #include -/* - * OneFS stores streams without the explicit :$DATA at the end, so this strips - * it off. All onefs_stream functions must call through this instead of - * split_ntfs_stream_name directly. - */ -NTSTATUS onefs_split_ntfs_stream_name(TALLOC_CTX *mem_ctx, const char *fname, - char **pbase, char **pstream) -{ - NTSTATUS status; - char *stream; - - status = split_ntfs_stream_name(mem_ctx, fname, pbase, pstream); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - /* Default $DATA stream. */ - if (pstream == NULL || *pstream == NULL) { - return NT_STATUS_OK; - } - - /* Strip off the $DATA. */ - stream = strrchr_m(*pstream, ':'); - SMB_ASSERT(stream); - stream[0] = '\0'; - - return NT_STATUS_OK; -} - NTSTATUS onefs_stream_prep_smb_fname(TALLOC_CTX *ctx, const struct smb_filename *smb_fname_in, struct smb_filename **smb_fname_out) @@ -100,25 +71,6 @@ NTSTATUS onefs_stream_prep_smb_fname(TALLOC_CTX *ctx, return status; } -int onefs_is_stream(const char *path, char **pbase, char **pstream, - bool *is_stream) -{ - (*is_stream) = is_ntfs_stream_name(path); - - if (!(*is_stream)) { - return 0; - } - - if (!NT_STATUS_IS_OK(onefs_split_ntfs_stream_name(talloc_tos(), path, - pbase, pstream))) { - DEBUG(10, ("onefs_split_ntfs_stream_name failed\n")); - errno = ENOMEM; - return -1; - } - - return 0; -} - int onefs_close(vfs_handle_struct *handle, struct files_struct *fsp) { int ret2, ret = 0;