From cf5cf4cadb35c7ebabf025bf6781f69c390548c8 Mon Sep 17 00:00:00 2001 From: Patrick Lam Date: Wed, 22 Feb 2006 04:50:16 +0000 Subject: [PATCH] Strip \r and whitespace from input; fixes bug 3454. --- ChangeLog | 7 ++++++- fc-lang/fc-lang.c | 11 +++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5265c6d..4aec46d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-02-21 Patrick Lam - * fc-lang/fc-lang.c: + * fc-lang/fc-lang.c (scan): + + Strip \r and whitespace from input; fixes bug 3454. + +2006-02-21 Patrick Lam + * fc-lang/fc-lang.c (main): Allocate large arrays statically in fc-lang to fix crashes under MinGW/MSYS. diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c index ebb8539..1efd0c1 100644 --- a/fc-lang/fc-lang.c +++ b/fc-lang/fc-lang.c @@ -80,12 +80,18 @@ static char * get_line (FILE *f, char *line, int *lineno) { char *hash; + int end; if (!fgets (line, 1024, f)) return 0; ++(*lineno); hash = strchr (line, '#'); if (hash) *hash = '\0'; + + end = strlen (line); + while (end > 0 && isspace (line[end-1])) + line[--end] = '\0'; + if (line[0] == '\0' || line[0] == '\n' || line[0] == '\032' || line[0] == '\r') return get_line (f, line, lineno); return line; @@ -134,11 +140,8 @@ scan (FILE *f, char *file) if (!strncmp (line, "include", 7)) { file = strchr (line, ' '); - while (*file == ' ') + while (isspace(*file)) file++; - end = strlen (file); - if (file[end-1] == '\n') - file[end-1] = '\0'; f = scanopen (file); if (!f) fatal (file, 0, "can't open"); -- 2.7.4