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

made the command line parser not ignore any switch just before it didn't have a switch before it

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3461 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-02-04 20:03:30 +00:00
parent 1214352131
commit b1a527c4ce
5 changed files with 51 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Source/exehead/util.c
View file

@ -132,6 +132,15 @@ char *NSISCALL addtrailingslash(char *str)
return *CharPrev(str,str+mystrlen(str));
}*/
char * NSISCALL findchar(char *str, char c)
{
while (*str && *str != c)
{
str = CharNext(str);
}
return str;
}
void NSISCALL trimslashtoend(char *buf)
{
char *p = buf + mystrlen(buf);
@ -166,12 +175,9 @@ char * NSISCALL skip_root(char *path)
int x = 2;
while (x--)
{
while (*p2 != '\\')
{
if (!*p2)
return NULL;
p2 = CharNext(p2);
}
p2 = findchar(p2, '\\');
if (!*p2)
return NULL;
p2 = CharNext(p2);
}
@ -580,28 +586,32 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
char * NSISCALL validate_filename(char *in) {
char *nono = "*?|<>/\":";
short cur_char = 0;
char *out;
char *out_save;
while (*in == ' ') in = CharNext(in);
if (in[0] == '\\' && in[1] == '\\' && in[2] == '?' && in[3] == '\\') {
if (in[0] == '\\' && in[1] == '\\' && in[2] == '?' && in[3] == '\\')
{
// at least four bytes
in += 4;
}
if (*in) {
if (*in)
{
// at least two bytes
if (validpathspec(in)) in += 2;
}
out = out_save = in;
while (*(char*)&cur_char = *in) {
if (cur_char > 31 && !mystrstri(nono, (char*)&cur_char)) {
while (*in)
{
if (*in > 31 && !*findchar(nono, *in))
{
mini_memcpy(out, in, CharNext(in) - in);
out = CharNext(out);
}
in = CharNext(in);
}
*out = 0;
do {
do
{
out = CharPrev(out_save, out);
if (*out == ' ' || *out == '\\')
*out = 0;