From 3ca09d432c1ec65944da279b7851b960dd564870 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 11 May 2002 00:33:51 +0000
Subject: [PATCH] Fixes for recycle bin VFS for FreeBSD from "Scot W. Hetzel"
 <hetzels@westbend.net>. Jeremy (This used to be commit
 68b83335de0215314c2234aa83069d8fb8265b80)

---
 examples/VFS/Makefile  |  3 ++-
 examples/VFS/recycle.c | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/examples/VFS/Makefile b/examples/VFS/Makefile
index 716e48da88d..f93cd0cb2df 100644
--- a/examples/VFS/Makefile
+++ b/examples/VFS/Makefile
@@ -10,10 +10,11 @@ LIBTOOL = libtool
 
 SAMBA_SRC = ../../source
 SAMBA_INCL = ../../source/include
+POPT_INCL = ../../source/popt
 UBIQX_SRC = ../../source/ubiqx
 SMBWR_SRC = ../../source/smbwrapper
 KRB5_SRC = /usr/kerberos/include
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(KRB5_SRC) -Wall -g
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(POPT_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(KRB5_SRC) -Wall -g
 VFS_OBJS = audit.so skel.so recycle.so
 
 # Default target
diff --git a/examples/VFS/recycle.c b/examples/VFS/recycle.c
index 74d3657895a..6a1c98ce54e 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++);