diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-09-22 13:01:55 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:02 -0500 |
commit | d3fc90eaa185a15f2bd7fca11663e898feb2c81c (patch) | |
tree | 1c3f6393adafc9a13a2f4430c11f6a9e54d3a64d | |
parent | 6ad5996ef5e346d042da12874485c16b89536fc2 (diff) | |
download | samba-d3fc90eaa185a15f2bd7fca11663e898feb2c81c.tar.gz samba-d3fc90eaa185a15f2bd7fca11663e898feb2c81c.tar.bz2 samba-d3fc90eaa185a15f2bd7fca11663e898feb2c81c.zip |
r2524: a simple pvfs rename implementation to make testing easier
(This used to be commit 98c1c75076fdb0df3a7c616f8c2e1ed138a6ff9a)
-rw-r--r-- | source4/ntvfs/config.mk | 1 | ||||
-rw-r--r-- | source4/ntvfs/posix/pvfs_rename.c | 69 | ||||
-rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 10 |
3 files changed, 70 insertions, 10 deletions
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk index 416b14a3b3..cf48cc61c2 100644 --- a/source4/ntvfs/config.mk +++ b/source4/ntvfs/config.mk @@ -57,6 +57,7 @@ ADD_OBJ_FILES = \ ntvfs/posix/pvfs_fsinfo.o \ ntvfs/posix/pvfs_qfileinfo.o \ ntvfs/posix/pvfs_setfileinfo.o \ + ntvfs/posix/pvfs_rename.o \ ntvfs/posix/pvfs_resolve.o \ ntvfs/posix/pvfs_shortname.o # End MODULE ntvfs_posix diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c new file mode 100644 index 0000000000..40b84f7628 --- /dev/null +++ b/source4/ntvfs/posix/pvfs_rename.c @@ -0,0 +1,69 @@ +/* + Unix SMB/CIFS implementation. + + POSIX NTVFS backend - rename + + Copyright (C) Andrew Tridgell 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "include/includes.h" +#include "vfs_posix.h" + +/* + rename a set of files +*/ +NTSTATUS pvfs_rename(struct smbsrv_request *req, union smb_rename *ren) +{ + struct pvfs_state *pvfs = req->tcon->ntvfs_private; + NTSTATUS status; + struct pvfs_filename *name1, *name2; + + if (ren->generic.level != RAW_RENAME_RENAME) { + return NT_STATUS_INVALID_LEVEL; + } + + /* resolve the cifs name to a posix name */ + status = pvfs_resolve_name(pvfs, req, ren->rename.in.pattern1, 0, &name1); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + status = pvfs_resolve_name(pvfs, req, ren->rename.in.pattern2, 0, &name2); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + if (name1->has_wildcard || name2->has_wildcard) { + DEBUG(3,("Rejecting wildcard rename '%s' -> '%s'\n", + ren->rename.in.pattern1, ren->rename.in.pattern2)); + return NT_STATUS_NOT_SUPPORTED; + } + + if (!name1->exists) { + return NT_STATUS_OBJECT_NAME_NOT_FOUND; + } + + if (name2->exists) { + return NT_STATUS_OBJECT_NAME_COLLISION; + } + + if (rename(name1->full_name, name2->full_name) != 0) { + return pvfs_map_errno(pvfs, errno); + } + + return NT_STATUS_OK; +} diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index b2c9d81086..84a5647075 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -102,7 +102,6 @@ static NTSTATUS pvfs_disconnect(struct smbsrv_tcon *tcon) */ static NTSTATUS pvfs_ioctl(struct smbsrv_request *req, union smb_ioctl *io) { - DEBUG(0,("pvfs_ioctl not implemented\n")); return NT_STATUS_INVALID_PARAMETER; } @@ -133,15 +132,6 @@ static NTSTATUS pvfs_chkpath(struct smbsrv_request *req, struct smb_chkpath *cp) } /* - rename a set of files -*/ -static NTSTATUS pvfs_rename(struct smbsrv_request *req, union smb_rename *ren) -{ - DEBUG(0,("pvfs_rename not implemented\n")); - return NT_STATUS_NOT_IMPLEMENTED; -} - -/* copy a set of files */ static NTSTATUS pvfs_copy(struct smbsrv_request *req, struct smb_copy *cp) |