updated the 3.0 branch from the head branch - ready for alpha18

(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)

1 files changed, 13 insertions, 7 deletions

diff --git a/examples/VFS/recycle.c b/examples/VFS/recycle.c
index 74d3657895..6a1c98ce54 100644
--- a/examples/VFS/recycle.c
+++ b/examples/VFS/recycle.c
@@ -238,15 +238,18 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 		return default_vfs_ops.unlink(conn,fname);
 	}
 
-	base = strrchr(fname, '/') + 1;
-	if(base == (char*)1)
-		ext = strrchr(fname, '.');
-	else
-		ext = strrchr(base, '.');
-
+	base = strrchr(fname, '/');
 	pstrcpy(bin, recycle_bin);
 	pstrcat(bin, "/");
-	pstrcat(bin, base);
+
+	if(base == NULL) {
+		ext = strrchr(fname, '.');
+		pstrcat(bin, fname);
+	} else {
+		ext = strrchr(base, '.');
+		pstrcat(bin, base+1);
+	}
+	DEBUG(3, ("recycle bin: base %s, ext %s, fname %s, bin %s\n", base, ext, fname, bin));
 
 	if(strcmp(fname,bin) == 0) {
 		DEBUG(3, ("recycle bin: file %s exists, purging...\n", fname));
@@ -254,6 +257,9 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 	}
 
 	len = strlen(bin);
+	if ( ext != NULL)
+		len = len - strlen(ext);
+
 	addlen = sizeof(pstring)-len-1;
 	while(recycle_file_exist(conn,bin)) {
 		slprintf(bin+len, addlen, " (Copy #%d)", i++);