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

Remove newline with comment only lines in TEXT.

Browse Source
This commit is contained in:
Brenden Matthews 2009-07-04 20:57:41 -06:00
parent aaca08fc97
commit e2caa58923
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2009-07-04
* Remove newline with comment only lines in TEXT
2009-07-01 2009-07-01
* Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils) * Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils)

23
src/conky.c
View File

@ -3214,6 +3214,10 @@ static int text_contains_templates(const char *text)
return 0; return 0;
} }
/* folds a string over top of itself, like so:
*
* if start is "blah", and you call it with count = 1, the result will be "lah"
*/
static void strfold(char *start, int count) static void strfold(char *start, int count)
{ {
char *curplace; char *curplace;
@ -3226,13 +3230,18 @@ static void strfold(char *start, int count)
/* /*
* - assumes that *string is '#' * - assumes that *string is '#'
* - removes the part from '#' to the end of line ('\n' or '\0') * - removes the part from '#' to the end of line ('\n' or '\0')
* - BUT, it leaves the '\n' * - it removes the '\n'
* - copies the last char into 'char *last' argument, which should be a pointer
* to a char rather than a string.
*/ */
static size_t remove_comment(char *string) static size_t remove_comment(char *string, char *last)
{ {
char *end = string; char *end = string;
while(*end != '\0' && *end != '\n') while (*end != '\0' && *end != '\n') {
++end; ++end;
}
if (last) *last = *end;
if (*end == '\n') end++;
strfold(string, end - string); strfold(string, end - string);
return end - string; return end - string;
} }
@ -3247,7 +3256,7 @@ static size_t remove_comments(char *string)
strfold(curplace, 1); strfold(curplace, 1);
folded += 1; folded += 1;
} else if (*curplace == '#') { } else if (*curplace == '#') {
folded += remove_comment(curplace); folded += remove_comment(curplace, 0);
} }
} }
return folded; return folded;
@ -3388,7 +3397,11 @@ static int extract_variable_text_internal(struct text_object *retval, const char
} else if (*p == '\\' && *(p+1) == '#') { } else if (*p == '\\' && *(p+1) == '#') {
strfold(p, 1); strfold(p, 1);
} else if (*p == '#') { } else if (*p == '#') {
remove_comment(p); char c;
if (remove_comment(p, &c) && p > orig_p && c == '\n') {
/* if remove_comment removed a newline, we need to 'back up' with p */
p--;
}
} }
p++; p++;
} }