Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

simplify if_existing evaluation

Browse Source
This commit is contained in:
Phil Sutter 2008-12-15 16:39:48 +01:00
parent 334447308f
commit a98d6e06ac
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conky.c
View File

@ -5110,24 +5110,16 @@ static void generate_text_internal(char *p, int p_max_size,
free(tmp_info);
}
OBJ(if_existing) {
struct stat tmp;
if ((obj->data.ifblock.s)
&& (stat(obj->data.ifblock.s, &tmp) == -1)) {
if_jumped = 0;
if (obj->data.ifblock.str
&& !check_contains(obj->data.ifblock.s,
obj->data.ifblock.str)) {
i = obj->data.ifblock.pos;
if_jumped = 1;
} else if (obj->data.ifblock.s
&& access(obj->data.ifblock.s, F_OK)) {
i = obj->data.ifblock.pos;
if_jumped = 1;
} else {
if (obj->data.ifblock.str) {
if (!check_contains(obj->data.ifblock.s,
obj->data.ifblock.str)) {
i = obj->data.ifblock.pos;
if_jumped = 1;
} else {
if_jumped = 0;
}
} else {
if_jumped = 0;
}
}
}
OBJ(if_mounted) {