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

Merge branch 'master' into imlib2

Browse Source
This commit is contained in:
Brenden Matthews 2009-05-12 18:07:20 -06:00
commit 1b94e22b5c
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/conky.c
View File

@ -2900,6 +2900,30 @@ static int text_contains_templates(const char *text)
return 0; return 0;
} }
static void remove_comments(char *string)
{
char *curplace, *curplace2;
char *newend = NULL;
for(curplace = string; *curplace != 0; curplace++) {
if(*curplace == '\\' && *(curplace + 1) == '#') {
//strcpy can't be used for overlapping strings
for (curplace2 = curplace+1; *curplace2 != 0; curplace2++) {
*(curplace2 - 1) = *curplace2;
}
*(curplace2 - 1) = 0;
} else if(*curplace == '#' && !newend) {
newend = curplace;
} else if(*curplace == '\n' && newend) {
*newend = '\n';
newend++;
}
}
if(newend) {
*newend = 0;
}
}
static int extract_variable_text_internal(struct text_object *retval, const char *const_p, char allow_threaded) static int extract_variable_text_internal(struct text_object *retval, const char *const_p, char allow_threaded)
{ {
struct text_object *obj; struct text_object *obj;
@ -3035,6 +3059,7 @@ static int extract_variable_text_internal(struct text_object *retval, const char
} }
p++; p++;
} }
remove_comments(s);
obj = create_plain_text(s); obj = create_plain_text(s);
if (obj != NULL) { if (obj != NULL) {
append_object(retval, obj); append_object(retval, obj);
@ -6891,29 +6916,6 @@ static FILE *open_config_file(const char *f)
return fopen(f, "r"); return fopen(f, "r");
} }
void remove_comments(char *string) {
char *curplace, *curplace2;
char *newend = NULL;
for(curplace = string; *curplace != 0; curplace++) {
if(*curplace == '\\' && *(curplace + 1) == '#') {
//strcpy can't be used for overlapping strings
for (curplace2 = curplace+1; *curplace2 != 0; curplace2++) {
*(curplace2 - 1) = *curplace2;
}
*(curplace2 - 1) = 0;
} else if(*curplace == '#' && !newend) {
newend = curplace;
} else if(*curplace == '\n' && newend) {
*newend = '\n';
newend++;
}
}
if(newend) {
*newend = 0;
}
}
static int do_config_step(int *line, FILE *fp, char *buf, char **name, char **value) static int do_config_step(int *line, FILE *fp, char *buf, char **name, char **value)
{ {
char *p, *p2; char *p, *p2;
@ -7546,7 +7548,6 @@ static void load_config_file(const char *f)
if (fgets(buf, CONF_BUFF_SIZE, fp) == NULL) { if (fgets(buf, CONF_BUFF_SIZE, fp) == NULL) {
break; break;
} }
remove_comments(buf);
/* Remove \\-\n. */ /* Remove \\-\n. */
bl = strlen(buf); bl = strlen(buf);