From 27fff0d9cbe067fc08e3690655e8d2e80dd83be4 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Fri, 1 May 2009 23:05:06 -0600 Subject: [PATCH] Fixed $texeci regression. --- ChangeLog | 1 + src/conky.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30b6eb7..0f0c47c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2009-05-01 * Added diskio_avg_samples patch (thanks Yeon-Hyeong) + * Fixed $texeci regression 2009-04-30 * Added $combine, a var that places 2 other vars next to each other, even if they diff --git a/src/conky.c b/src/conky.c index 13ae965..128494e 100644 --- a/src/conky.c +++ b/src/conky.c @@ -587,21 +587,24 @@ void *threaded_exec(void *) __attribute__((noreturn)); void *threaded_exec(void *arg) { - char *p2; + char *buff, *p2; struct text_object *obj = (struct text_object *)arg; while (1) { - p2 = obj->data.texeci.buffer; - timed_thread_lock(obj->data.texeci.p_timed_thread); - read_exec(obj->data.texeci.cmd, obj->data.texeci.buffer, + buff = malloc(text_buffer_size); + read_exec(obj->data.texeci.cmd, buff, text_buffer_size); + p2 = buff; while (*p2) { if (*p2 == '\001') { *p2 = ' '; } p2++; } + timed_thread_lock(obj->data.texeci.p_timed_thread); + strncpy(obj->data.texeci.buffer, buff, text_buffer_size); timed_thread_unlock(obj->data.texeci.p_timed_thread); + free(buff); if (timed_thread_test(obj->data.texeci.p_timed_thread, 0)) { timed_thread_exit(obj->data.texeci.p_timed_thread); } @@ -3746,10 +3749,11 @@ static void generate_text_internal(char *p, int p_max_size, if (timed_thread_run(obj->data.texeci.p_timed_thread)) { ERR("Error running texeci timed thread"); } + } else { + timed_thread_lock(obj->data.texeci.p_timed_thread); + snprintf(p, text_buffer_size, "%s", obj->data.texeci.buffer); + timed_thread_unlock(obj->data.texeci.p_timed_thread); } - timed_thread_lock(obj->data.texeci.p_timed_thread); - snprintf(p, text_buffer_size, "%s", obj->data.texeci.buffer); - timed_thread_unlock(obj->data.texeci.p_timed_thread); } #endif /* HAVE_POPEN */ OBJ(imap_unseen) { -- 1.7.9.5