From f5356014a3ea31f820c5df86270258b2a6c1be1f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 17 Jan 2012 18:40:12 +0000 Subject: Add test cases for lilv_expand and fix bugs. git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3958 a436a847-0d15-0410-975c-d299462d15a1 --- src/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/util.c b/src/util.c index e0cd027..8079bab 100644 --- a/src/util.c +++ b/src/util.c @@ -170,7 +170,7 @@ lilv_expand(const char* path) if (*s == '$') { // Hit $ (variable reference, e.g. $VAR_NAME) for (const char* t = s + 1; ; ++t) { - if (*t == '\0' || !(isupper(*t) || *t == '_')) { + if (!*t || !(isupper(*t) || isdigit(*t) || *t == '_')) { // Append preceding chunk out = strappend(out, &len, start, s - start); @@ -185,7 +185,7 @@ lilv_expand(const char* path) break; } } - } else if (*s == '~' && (*(s + 1) == '/' || (*(s + 1) == '\0'))) { + } else if (*s == '~' && (*(s + 1) == '/' || !*(s + 1))) { // Hit ~ before slash or end of string (home directory reference) out = strappend(out, &len, start, s - start); append_var(out, &len, "HOME"); -- cgit v1.2.1