From 9c161e776f0aa97d4cea5af7a0de070a6cc428d7 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 26 Feb 2008 17:13:18 +0100
Subject: [PATCH] Removed the obsolete filebasename interface from fnet.

---
 daemon/filenet.c  |  9 +++++++++
 daemon/filenet.h  |  2 +-
 daemon/fnet-dc.c  | 10 ----------
 daemon/search.c   |  8 ++------
 daemon/transfer.c |  4 +---
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/daemon/filenet.c b/daemon/filenet.c
index a74f454..da83a09 100644
--- a/daemon/filenet.c
+++ b/daemon/filenet.c
@@ -459,6 +459,15 @@ void fnetsetstate(struct fnetnode *fn, int newstate)
     CBCHAINDOCB(fn, fnetnode_ac, fn, L"state");
 }
 
+wchar_t *fnfilebasename(wchar_t *path)
+{
+    wchar_t *p;
+    
+    if((p = wcsrchr(path, L'/')) != NULL)
+	return(p + 1);
+    return(path);
+}
+
 struct fnet *findfnet(wchar_t *name)
 {
     struct fnet *fnet;
diff --git a/daemon/filenet.h b/daemon/filenet.h
index 8d2c8db..ffb2acb 100644
--- a/daemon/filenet.h
+++ b/daemon/filenet.h
@@ -51,7 +51,6 @@ struct fnet
     int (*reqconn)(struct fnetpeer *peer);
     int (*sendchat)(struct fnetnode *fn, int public, wchar_t *to, wchar_t *string);
     int (*search)(struct fnetnode *fn, struct search *srch, struct srchfnnlist *ln);
-    wchar_t *(*filebasename)(wchar_t *filename);
 };
 
 struct fnetpeerdatum
@@ -142,6 +141,7 @@ struct fnetnode *findfnetnode(int id);
 void fnethandlechat(struct fnetnode *fn, int public, wchar_t *name, wchar_t *peer, wchar_t *chat);
 int fnetsendchat(struct fnetnode *fn, int public, wchar_t *to, wchar_t *string);
 int fnetsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlist *ln);
+wchar_t *fnfilebasename(wchar_t *path);
 
 extern struct fnetnode *fnetnodes;
 EGCBCHAIN(newfncb, struct fnetnode *);
diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index a8faf28..0e035fe 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -3222,15 +3222,6 @@ static void hubkill(struct fnetnode *fn)
     hub->sk->close = 1;
 }
 
-static wchar_t *dcbasename(wchar_t *filename)
-{
-    wchar_t *ret;
-    
-    if((ret = wcsrchr(filename, L'/')) != NULL)
-	return(ret + 1);
-    return(filename);
-}
-
 static struct transferiface dctransfer =
 {
     .detach = (void (*)(struct transfer *, void *))dctransdetach,
@@ -3249,7 +3240,6 @@ static struct fnet dcnet =
     .reqconn = hubreqconn,
     .sendchat = hubsendchat,
     .search = hubsearch,
-    .filebasename = dcbasename
 };
 
 static void peerread(struct socket *sk, struct dcpeer *peer)
diff --git a/daemon/search.c b/daemon/search.c
index 7d22c37..d2d9969 100644
--- a/daemon/search.c
+++ b/daemon/search.c
@@ -1085,9 +1085,7 @@ static int srisvalid(struct srchres *sr, struct sexpr *sexpr)
 	free(buf);
 	return(!ret);
     case SOP_LINKRE:
-	p = sr->filename;
-	if(sr->fnet->filebasename != NULL)
-	    p = sr->fnet->filebasename(p);
+	p = fnfilebasename(sr->filename);
 	if((buf = icwcstombs(p, "UTF-8")) == NULL)
 	    return(0);
 	ret = regexec(&sexpr->d.re.cre, buf, 0, NULL, 0);
@@ -1096,9 +1094,7 @@ static int srisvalid(struct srchres *sr, struct sexpr *sexpr)
     case SOP_NAMESS:
 	return(wcsexists(sr->filename, sexpr->d.s));
     case SOP_LINKSS:
-	p = sr->filename;
-	if(sr->fnet->filebasename != NULL)
-	    p = sr->fnet->filebasename(p);
+	p = fnfilebasename(sr->filename);
 	return(wcsexists(p, sexpr->d.s));
     case SOP_SIZELT:
 	return(sr->size < sexpr->d.n);
diff --git a/daemon/transfer.c b/daemon/transfer.c
index c432815..328fb33 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -616,9 +616,7 @@ int forkfilter(struct transfer *transfer)
     struct wcspair *ta;
     char *rec, *val;
 
-    wfilename = transfer->path;
-    if(transfer->fnet->filebasename != NULL)
-	wfilename = transfer->fnet->filebasename(wfilename);
+    wfilename = fnfilebasename(transfer->path);
     if(transfer->auth == NULL)
     {
 	flog(LOG_WARNING, "tried to fork filter for transfer with NULL authhandle (tranfer %i)", transfer->id);
-- 
2.11.0