Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed wcsexists from libcommon.
[doldaconnect.git]
/
daemon
/
fnet-dc.c
diff --git
a/daemon/fnet-dc.c
b/daemon/fnet-dc.c
index
b79e84d
..
c7d916d
100644
(file)
--- a/
daemon/fnet-dc.c
+++ b/
daemon/fnet-dc.c
@@
-1123,7
+1123,7
@@
static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
size_t buflen;
int termnum, satisfied, skipcheck;
int level, tersat[32];
size_t buflen;
int termnum, satisfied, skipcheck;
int level, tersat[32];
- wchar_t *terms[32];
+ wchar_t *terms[32]
, *lname
;
char hashtth[24];
hub = fn->data;
char hashtth[24];
hub = fn->data;
@@
-1211,8
+1211,10
@@
static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
memcpy(hashtth, buf, 24);
free(buf);
} else {
memcpy(hashtth, buf, 24);
free(buf);
} else {
- if((terms[termnum] = icmbstowcs(p, hub->charset)) != NULL)
+ if((terms[termnum] = icmbstowcs(p, hub->charset)) != NULL) {
+ wcslower(terms[termnum]);
termnum++;
termnum++;
+ }
}
}
p = p2 + 1;
}
}
p = p2 + 1;
@@
-1244,11
+1246,12
@@
static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
}
if(!skipcheck)
{
}
if(!skipcheck)
{
+ lname = wcslower(swcsdup(node->name));
for(i = 0; i < termnum; i++)
{
if(tersat[i] >= 0)
continue;
for(i = 0; i < termnum; i++)
{
if(tersat[i] >= 0)
continue;
- if(wcs
exists(node->
name, terms[i]))
+ if(wcs
str(l
name, terms[i]))
{
tersat[i] = level;
satisfied++;
{
tersat[i] = level;
satisfied++;
@@
-1256,6
+1259,7
@@
static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
break;
}
}
break;
}
}
+ free(lname);
}
if(!skipcheck && (satisfied == termnum))
{
}
if(!skipcheck && (satisfied == termnum))
{