X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ftemplate.c;h=a4351fd2dd61bcdfba717e99f1020a36fef2a91b;hb=792da5a7db6e0d09f66a768a1fb70a8a7b8f3d95;hp=4cbf21d3bb5cb38536104fa10800513ec56a568b;hpb=09c0bccf55cd42fc27ffb234bda7c65b04e3dd60;p=monky

diff --git a/src/template.c b/src/template.c
index 4cbf21d..a4351fd 100644
--- a/src/template.c
+++ b/src/template.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -203,7 +203,7 @@ char *find_and_replace_templates(const char *inbuf)
 		if (!(*p))
 			break;
 
-		if (strncmp(p, "$template", 9) && strncmp(p, "${template", 10)) {
+		if (strncmp(p, "$template", strlen("$template")) && strncmp(p, "${template", strlen("${template"))) {
 			*(o++) = *(p++);
 			continue;
 		}
@@ -235,7 +235,8 @@ char *find_and_replace_templates(const char *inbuf)
 			}
 		} else {
 			templ = p + 1;
-			while (*p && !isspace(*p))
+			p += strlen("$template");
+			while (*p && isdigit(*p))
 				p++;
 			args = NULL;
 		}