dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Version Information now rely on languages, some more updates on named uservars, maybe last one before official release :) (preview UserVars.nsi - doesn't compile yet)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2633 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
ramon18 2003-06-12 00:06:23 +00:00
parent 7adbddc567
commit 1ea2160310
14 changed files with 539 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/strlist.h
View file

@ -278,7 +278,7 @@ class SortedStringListND // no delete - can be placed in GrowBuf
{
int where;
T newstruct={0,};
int pos=find(name,case_sensitive,1,&where);
int pos=find(name,-1,case_sensitive,1,&where);
if (pos==-1) return alwaysreturnpos ? where : -1;
newstruct.name=strings.add(name,strlen(name)+1);
@ -292,7 +292,8 @@ class SortedStringListND // no delete - can be placed in GrowBuf
// returns -1 if not found, position if found
// if returnbestpos=1 returns -1 if found, best pos to insert if not found
int find(const char *str, int case_sensitive=0, int returnbestpos=0, int *where=0)
// if n_chars equal to -1 all string is tested
int find(const char *str, size_t n_chars=-1, int case_sensitive=0, int returnbestpos=0, int *where=0)
{
T *data=(T *)gr.get();
int ul=gr.getlen()/sizeof(T);
@ -302,10 +303,22 @@ class SortedStringListND // no delete - can be placed in GrowBuf
while (ul > ll)
{
int res;
if (case_sensitive)
res=strcmp(str, (char*)strings.get() + data[nextpos].name);
const char *pCurr = (char*)strings.get() + data[nextpos].name;
if (n_chars == -1 || n_chars != strlen(pCurr) )
{
if (case_sensitive)
res=strcmp(str, pCurr);
else
res=stricmp(str, pCurr);
}
else
res=stricmp(str, (char*)strings.get() + data[nextpos].name);
{
if (case_sensitive)
res=strncmp(str, pCurr, n_chars);
else
res=strnicmp(str, pCurr, n_chars);
}
if (res==0)
{
if (where) *where = nextpos;