forked from KolibriOS/kolibrios
873fc290d5
1. possibility to open HTTPS sites via gate.aspero.pro (invisible for user), not working for files
2. rewrite parse tag function to fix broken URLs on page in some cases ("/user" instead of "/user/")
3. fix hand cursor appearance, fix progress bar on page load
4. load homepage on submitting empty url in adressbox
5. F12 - debug on, F11 - old tag parser on
6. unify page/file downloading code
git-svn-id: svn://kolibrios.org@7282 a494cfbc-eb01-0410-851d-a64ba20cac60
117 lines
2.3 KiB
C
117 lines
2.3 KiB
C
bool GetNextParam() {
|
|
if (!old_tag_parser_mode)
|
|
return GetNextParam_NEW();
|
|
else
|
|
return GetNextParam_OLD();
|
|
}
|
|
|
|
bool GetNextParam_NEW()
|
|
{
|
|
byte quotes = NULL;
|
|
int i;
|
|
|
|
if (!tagparam) return false;
|
|
|
|
if (debug_mode) {
|
|
debug("tagparam: "); debugln(#tagparam);
|
|
}
|
|
|
|
i = strlen(#tagparam) - 1;
|
|
|
|
if (tagparam[i] == '/') i--;
|
|
|
|
while (i>0) && (__isWhite(tagparam[i])) i--;
|
|
|
|
if (tagparam[i] == '"') || (tagparam[i] == '\'')
|
|
{
|
|
//find VAL end
|
|
quotes = tagparam[i];
|
|
tagparam[i] = '\0'; i--;
|
|
|
|
//find VAL start and copy
|
|
i = strrchr(#tagparam, quotes);
|
|
strlcpy(#val, #tagparam + i, sizeof(val));
|
|
tagparam[i] = '\0'; i--;
|
|
|
|
//find ATTR end
|
|
while (i > 0) && (tagparam[i] != '=') i--;
|
|
tagparam[i+1] = '\0';
|
|
}
|
|
else
|
|
{
|
|
//find VAL end
|
|
//already have
|
|
|
|
//find VAL start and copy
|
|
while (i > 0) && (tagparam[i] != '=') i--;
|
|
i++;
|
|
strlcpy(#val, #tagparam + i, sizeof(val));
|
|
tagparam[i] = '\0';
|
|
|
|
//find ATTR end
|
|
//already have
|
|
}
|
|
|
|
//find ATTR start and copy
|
|
while (i>0) && (!__isWhite(tagparam[i])) i--;
|
|
strlcpy(#attr, #tagparam + i + 1, sizeof(attr));
|
|
tagparam[i] = '\0';
|
|
|
|
strlwr(#attr);
|
|
|
|
if (debug_mode) {
|
|
if (quotes) {
|
|
debug("quote: "); debugch(quotes); debugln(" ");
|
|
}
|
|
else {
|
|
debugln("unquoted text");
|
|
}
|
|
sprintf(#param, "val: %s\nattr: %s\n\n", #val, #attr);
|
|
debug(#param);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
|
|
unsigned int GetNextParam_OLD()
|
|
{
|
|
byte kavichki=0;
|
|
int i = strlen(#tagparam) - 1;
|
|
|
|
if (!tagparam) return 0;
|
|
|
|
WHILE((i > 0) && ((tagparam[i] == '"') || (tagparam[i] == ' ') || (tagparam[i] == '\'') || (tagparam[i] == '/')))
|
|
{
|
|
IF (tagparam[i] == '"') || (tagparam[i] == '\'') kavichki=tagparam[i];
|
|
tagparam[i] = 0x00;
|
|
i--;
|
|
}
|
|
|
|
if (kavichki)
|
|
{
|
|
i = strrchr(#tagparam, kavichki);
|
|
strlcpy(#val, #tagparam + i, sizeof(val));
|
|
}
|
|
else
|
|
{
|
|
WHILE((i > 0) && (tagparam[i] <>'=')) i--; //i=strrchr(#tagparam, '=')+1;
|
|
i++;
|
|
strlcpy(#val, #tagparam + i, sizeof(val));
|
|
|
|
WHILE (val[0] == ' ') strcpy(#val, #val+1);
|
|
ESBYTE[strchr(#val, ' ')] = NULL;
|
|
}
|
|
tagparam[i] = 0x00;
|
|
|
|
FOR ( ; ((tagparam[i] <>' ') && (i > 0); i--)
|
|
{
|
|
IF (tagparam[i] == '=') //dirty fix (kludge)
|
|
tagparam[i + 1] = 0x00;
|
|
}
|
|
strlcpy(#attr, #tagparam + i + 1, sizeof(attr));
|
|
tagparam[i] = 0x00;
|
|
strlwr(#attr);
|
|
return 1;
|
|
} |