From 09a10701df62c421874c385b5a33767035c4baa2 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Thu, 5 Jan 2006 07:18:27 +0000 Subject: [PATCH] infopipe work in progress git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@463 7f574dfc-610e-0410-a909-a81674777703 --- src/infopipe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/infopipe.c b/src/infopipe.c index 34978b15..7e1b2abb 100644 --- a/src/infopipe.c +++ b/src/infopipe.c @@ -35,6 +35,7 @@ #include #include "conky.h" +/* access to this item array is synchronized with mutexes */ static char g_item[14][256]; /* ---------------------------------------- @@ -99,15 +100,14 @@ void *infopipe_service(void *pvoid) if (read(fd,buf,sizeof(buf))>0) { pbuf=buf; + pthread_mutex_lock(&info.infopipe.item_mutex); for (i=0;i<14;i++) { sscanf(pbuf,"%*[^:]: %[^\n]",g_item[i]); while(*pbuf++ != '\n'); } - - pthread_mutex_lock(&info.infopipe.item_mutex); - memcpy(&info.infopipe.item,g_item,sizeof(g_item)); pthread_mutex_unlock(&info.infopipe.item_mutex); - /* + + /* -- debug to console -- for(i=0;i<14;i++) printf("%s\n",g_item[i]); */