summaryrefslogtreecommitdiff
path: root/apps/gui/wps_parser.c
diff options
context:
space:
mode:
authorNicolas Pennequin <nicolas.pennequin@free.fr>2007-04-13 11:43:10 +0000
committerNicolas Pennequin <nicolas.pennequin@free.fr>2007-04-13 11:43:10 +0000
commit2ea39db310b9f46c9829e0bba8b601191f03f8c6 (patch)
tree81988091ed52447991b304524922ed3ee0dddc4d /apps/gui/wps_parser.c
parentc05ee023125a841e8e9311992aa134807a59fe73 (diff)
FS#7020. Make the behaviour of '#' more consistent. It now requires escaping by a '%' to be displayed. If it is not escaped, the following text will be interpreted as a comment (including the newline character).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13140 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps_parser.c')
-rw-r--r--apps/gui/wps_parser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 8e726f1b9d..c0a1202eb8 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -570,6 +570,7 @@ static int parse_token(const char *wps_bufptr, struct wps_data *wps_data)
case '|':
case '>':
case ';':
+ case '#':
/* escaped characters */
token->type = WPS_TOKEN_CHARACTER;
token->value.c = *wps_bufptr;
@@ -728,7 +729,7 @@ condlistend: /* close a conditional. sometimes we want to close them even when
*current_string++ = *(wps_bufptr - 1);
/* continue until we hit something that ends the string */
- while(wps_bufptr &&
+ while(wps_bufptr && *wps_bufptr != '#' &&
*wps_bufptr != '%' && *wps_bufptr != ';' &&
*wps_bufptr != '<' && *wps_bufptr != '>' &&
*wps_bufptr != '|' && *wps_bufptr != '\n')