svn commit: samba r2524 - in branches/SAMBA_4_0/source/ntvfs: . posix

[tridge at samba.org]

Author: tridge
Date: 2004-09-22 13:01:55 +0000 (Wed, 22 Sep 2004)
New Revision: 2524

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/ntvfs&rev=2524&nolog=1

Log:
a simple pvfs rename implementation to make testing easier



Added:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c
Modified:
   branches/SAMBA_4_0/source/ntvfs/config.mk
   branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/config.mk	2004-09-22 13:01:00 UTC (rev 2523)
+++ branches/SAMBA_4_0/source/ntvfs/config.mk	2004-09-22 13:01:55 UTC (rev 2524)
@@ -57,6 +57,7 @@
 		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

Added: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c	2004-09-22 13:01:00 UTC (rev 2523)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c	2004-09-22 13:01:55 UTC (rev 2524)
@@ -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;
+}

Modified: branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c	2004-09-22 13:01:00 UTC (rev 2523)
+++ branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c	2004-09-22 13:01:55 UTC (rev 2524)
@@ -102,7 +102,6 @@
 */
 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 @@
 }
 
 /*
-  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)