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

diff --git a/daemon/search.c b/daemon/search.c
index b319685..d16e5a0 100644
--- a/daemon/search.c
+++ b/daemon/search.c
@@ -515,6 +515,11 @@ void putsexpr(struct sexpr *sexpr)
 	if(sexpr->d.s != NULL)
 	    free(sexpr->d.s);
     }
+    if(sexpr->op == SOP_HASHIS)
+    {
+	if(sexpr->d.hash != NULL)
+	    freehash(sexpr->d.hash);
+    }
     free(sexpr);
 }
 
@@ -649,6 +654,23 @@ struct sexpr *parsesexpr(int argc, wchar_t **argv)
 		freetok(tok2);
 		putsexpr(sexpr);
 		done = 0;
+	    } else if((st->type == TOK_STR) && !wcsncmp(st->d.str, L"H=", 2)) {
+		tok2 = poptok(&st);
+		pushtok(tok = newtok(), &st);
+		tok->type = TOK_SE;
+		sexpr = newsexpr();
+		sexpr->op = SOP_HASHIS;
+		if((sexpr->d.hash = parsehash(tok2->d.str + 2)) == NULL)
+		{
+		    freetok(tok2);
+		    putsexpr(sexpr);
+		    goto out_err;
+		}
+		sexpr->cost = 2;
+		getsexpr(tok->d.se = sexpr);
+		freetok(tok2);
+		putsexpr(sexpr);
+		done = 0;
 	    } else if((std >= 3) && (st->type == TOK_CP) && (st->next->type == TOK_SE) && (st->next->next->type == TOK_OP)) {
 		freetok(poptok(&st));
 		tok = poptok(&st);
@@ -742,8 +764,6 @@ struct wcslist *findsexprstrs(struct sexpr *sexpr)
 	freesl(&l1);
 	freesl(&l2);
 	break;
-    case SOP_NOT:
-	break;
     case SOP_NAMERE:
     case SOP_LINKRE:
 	list = regexfindstrings(sexpr->d.re.sre);
@@ -1083,6 +1103,10 @@ static int srisvalid(struct srchres *sr, struct sexpr *sexpr)
 	return(sr->size == sexpr->d.n);
     case SOP_SIZEGT:
 	return(sr->size > sexpr->d.n);
+    case SOP_HASHIS:
+	if(sr->hash == NULL)
+	    return(0);
+	return(hashcmp(sr->hash, sexpr->d.hash));
     }
     return(0);
 }