Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 04:17:33 +00:00
Code Issues Releases Activity

A couple more fixes for the template machinery

Browse Source 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
This commit is contained in:
Pavel Labath 2009-06-04 17:55:45 +02:00 committed by Brenden Matthews
parent 20e4e19f83
commit c76b7f577d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conky.c
View File

@ -2982,12 +2982,12 @@ static char *handle_template(const char *tmpl, const char *args)
args_dup = strdup(args);
p = args_dup;
while (*p) {
while (*p && (*p == ' ' && *(p - 1) != '\\'))
while (*p && (*p == ' ' && p > args_dup && *(p - 1) != '\\'))
p++;
if (*(p - 1) == '\\')
if (p > args_dup && *(p - 1) == '\\')
p--;
p_old = p;
while (*p && (*p != ' ' || *(p - 1) == '\\'))
while (*p && (*p != ' ' || p == args_dup || *(p - 1) == '\\'))
p++;
if (*p) {
(*p) = '\0';
@ -3069,6 +3069,7 @@ static char *find_and_replace_templates(const char *inbuf)
tmpl_out = handle_template(templ, args);
if (tmpl_out) {
outlen += strlen(tmpl_out);
*o = '\0';
outbuf = realloc(outbuf, outlen * sizeof(char));
strcat (outbuf, tmpl_out);
free(tmpl_out);