Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-03 20:48:31 +00:00
Code Issues Releases Activity

Fix: Always include stuff that used to use popen because it's now using pid_popen

Browse Source
This commit is contained in:
Nikolas Garofil 2009-07-28 15:59:17 +02:00
parent 6c6711aa6d
commit e124064892
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/conky.c
View File

@ -1797,7 +1797,6 @@ static struct text_object *construct_text_object(const char *s,
obj->data.s = strndup(arg ? arg : "", text_buffer_size); obj->data.s = strndup(arg ? arg : "", text_buffer_size);
END OBJ(image, 0) END OBJ(image, 0)
obj->data.s = strndup(arg ? arg : "", text_buffer_size); obj->data.s = strndup(arg ? arg : "", text_buffer_size);
#ifdef HAVE_POPEN
END OBJ(exec, 0) END OBJ(exec, 0)
obj->data.s = strndup(arg ? arg : "", text_buffer_size); obj->data.s = strndup(arg ? arg : "", text_buffer_size);
END OBJ(execp, 0) END OBJ(execp, 0)
@ -1900,17 +1899,16 @@ static struct text_object *construct_text_object(const char *s,
obj->data.texeci.buffer = malloc(text_buffer_size); obj->data.texeci.buffer = malloc(text_buffer_size);
} }
obj->data.texeci.p_timed_thread = NULL; obj->data.texeci.p_timed_thread = NULL;
END OBJ(pre_exec, 0) END OBJ(pre_exec, 0)
obj->type = OBJ_text; obj->type = OBJ_text;
if (arg) { if (arg) {
char buf[2048]; char buf[2048];
read_exec(arg, buf, sizeof(buf)); read_exec(arg, buf, sizeof(buf));
obj->data.s = strndup(buf, text_buffer_size); obj->data.s = strndup(buf, text_buffer_size);
} else { } else {
obj->data.s = strndup("", text_buffer_size); obj->data.s = strndup("", text_buffer_size);
} }
#endif
END OBJ(fs_bar, INFO_FS) END OBJ(fs_bar, INFO_FS)
SIZE_DEFAULTS(bar); SIZE_DEFAULTS(bar);
arg = scan_bar(arg, &obj->data.fsbar.w, &obj->data.fsbar.h); arg = scan_bar(arg, &obj->data.fsbar.w, &obj->data.fsbar.h);
@ -4271,7 +4269,6 @@ static void generate_text_internal(char *p, int p_max_size,
OBJ(endif) { OBJ(endif) {
/* harmless object, just ignore */ /* harmless object, just ignore */
} }
#ifdef HAVE_POPEN
OBJ(addr) { OBJ(addr) {
if ((obj->data.net->addr.sa_data[2] & 255) == 0 if ((obj->data.net->addr.sa_data[2] & 255) == 0
&& (obj->data.net->addr.sa_data[3] & 255) == 0 && (obj->data.net->addr.sa_data[3] & 255) == 0
@ -4471,7 +4468,7 @@ static void generate_text_internal(char *p, int p_max_size,
parse_conky_vars(&subroot, obj->data.execi.buffer, p, tmp_info); parse_conky_vars(&subroot, obj->data.execi.buffer, p, tmp_info);
} else { } else {
char *output = obj->data.execi.buffer; char *output = obj->data.execi.buffer;
FILE *fp = popen(obj->data.execi.cmd, "r"); FILE *fp = pid_popen(obj->data.execi.cmd, "r", &childpid);
int length = fread(output, 1, text_buffer_size, fp); int length = fread(output, 1, text_buffer_size, fp);
pclose(fp); pclose(fp);
@ -4508,7 +4505,6 @@ static void generate_text_internal(char *p, int p_max_size,
timed_thread_unlock(obj->data.texeci.p_timed_thread); timed_thread_unlock(obj->data.texeci.p_timed_thread);
} }
} }
#endif /* HAVE_POPEN */
OBJ(imap_unseen) { OBJ(imap_unseen) {
struct mail_s *mail = ensure_mail_thread(obj, imap_thread, "imap"); struct mail_s *mail = ensure_mail_thread(obj, imap_thread, "imap");