X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fsearch.c;fp=daemon%2Fsearch.c;h=d2d9969c50a8905518fc9f31a53e1c1f0daabb29;hb=9c161e776f0aa97d4cea5af7a0de070a6cc428d7;hp=7d22c375e5cf51da6d9f81e1bd541d71b1e8f822;hpb=c319fb93b59bf09b5d20cc654af6ffb43d247a71;p=doldaconnect.git

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);