X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fsearch.c;h=633e07ee7fd15b7e03e8c9efd63513e5042180c8;hb=4e564b59c7c565387c4907017dfacce2ef761f8a;hp=d16e5a0118e28ee1a78a2fca0599c0bc4ffe4003;hpb=9d8cf7438740ac21033158d8ba039e40e1f3abc2;p=doldaconnect.git

diff --git a/daemon/search.c b/daemon/search.c
index d16e5a0..633e07e 100644
--- a/daemon/search.c
+++ b/daemon/search.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  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
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <stdlib.h>
-#include <malloc.h>
 #include <wchar.h>
 #include <wctype.h>
 #include <errno.h>
@@ -140,6 +139,19 @@ static struct wcslist *newsl(struct wcslist **list, wchar_t *str)
     return(ln);
 }
 
+static int wcsexists(wchar_t *h, wchar_t *n)
+{
+    size_t hl = wcslen(h), nl = wcslen(n);
+    wchar_t lh[hl + 1], ln[nl + 1];
+    int i;
+    
+    for(i = 0; i <= hl; i++)
+	lh[i] = towlower(h[i]);
+    for(i = 0; i <= nl; i++)
+	ln[i] = towlower(n[i]);
+    return(wcsstr(lh, ln) != NULL);
+}
+
 static void slmerge1(struct wcslist **list, wchar_t *str)
 {
     size_t len;
@@ -396,10 +408,12 @@ static struct reinfo analyzere(wchar_t *re, wchar_t **endret, wchar_t endc)
 	    if(ret.begstr != NULL)
 	    {
 		for(i = 0; (sinf.begstr[i] != L'\0') && (ret.begstr != L'\0') && (ret.begstr[i] == sinf.begstr[i]); i++);
-		if(i == 0)
+		if(i == 0) {
 		    free(ret.begstr);
-		else
+		    ret.begstr = NULL;
+		} else {
 		    ret.begstr[i] = L'\0';
+		}
 	    }
 	    free(sinf.begstr);
 	} else {
@@ -424,10 +438,12 @@ static struct reinfo analyzere(wchar_t *re, wchar_t **endret, wchar_t endc)
 		    maxlen = len1;
 		}
 		for(i = 1; (i <= minlen) && (ret.endstr[len1 - i] == sinf.endstr[len2 - i]); i++);
-		if(i == 1)
+		if(i == 1) {
 		    free(ret.endstr);
-		else if(i <= maxlen)
+		    ret.endstr = NULL;
+		} else if(i <= maxlen) {
 		    wmemmove(ret.endstr, ret.endstr + (len1 - i) + 1, i);
+		}
 	    }
 	    free(sinf.endstr);
 	} else {
@@ -648,7 +664,7 @@ struct sexpr *parsesexpr(int argc, wchar_t **argv)
 		    sexpr->op = SOP_SIZEEQ;
 		else
 		    sexpr->op = SOP_SIZEGT;
-		sexpr->d.n = wcstol(tok2->d.str + 2, NULL, 0);
+		sexpr->d.sz = wcstoll(tok2->d.str + 2, NULL, 0);
 		sexpr->cost = 0;
 		getsexpr(tok->d.se = sexpr);
 		freetok(tok2);
@@ -1082,9 +1098,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);
@@ -1093,16 +1107,14 @@ 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);
+	return(sr->size < sexpr->d.sz);
     case SOP_SIZEEQ:
-	return(sr->size == sexpr->d.n);
+	return(sr->size == sexpr->d.sz);
     case SOP_SIZEGT:
-	return(sr->size > sexpr->d.n);
+	return(sr->size > sexpr->d.sz);
     case SOP_HASHIS:
 	if(sr->hash == NULL)
 	    return(0);