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

APC UPS fixes.

Browse Source
This commit is contained in:
Jaromir Smrcek 2009-05-10 13:37:04 -06:00 committed by Brenden Matthews
parent bd7adc5fbb
commit 22601ff864
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/apcupsd.c
View File

@ -19,6 +19,7 @@
#include "conky.h"
#include "apcupsd.h"
#include "logging.h"
#include <errno.h>
#include <sys/time.h>
@ -159,6 +160,11 @@ void update_apcupsd(void) {
struct hostent* he = 0;
struct sockaddr_in addr;
short sz = 0;
#ifdef HAVE_GETHOSTBYNAME_R
struct hostent he_mem;
int he_errno;
char hostbuff[2048];
#endif
//
// connect to apcupsd daemon
//
@ -167,11 +173,19 @@ void update_apcupsd(void) {
perror("socket");
break;
}
#ifdef HAVE_GETHOSTBYNAME_R
if (gethostbyname_r(info.apcupsd.host, &he_mem, hostbuff, sizeof(hostbuff), &he, &he_errno)) {
ERR("APCUPSD gethostbyname_r: %s", hstrerror(h_errno));
break;
}
#else /* HAVE_GETHOSTBYNAME_R */
he = gethostbyname(info.apcupsd.host);
if (!he) {
herror("gethostbyname");
break;
}
#endif /* HAVE_GETHOSTBYNAME_R */
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = info.apcupsd.port;

2
src/conky.c
View File

@ -5120,7 +5120,7 @@ static void generate_text_internal(char *p, int p_max_size,
}
OBJ(apcupsd_loadgauge) {
double progress;
progress = atof(cur->apcupsd.items[APCUPSD_LOAD]);
progress = atof(cur->apcupsd.items[APCUPSD_LOAD]) / 100.0 * 255.0;
new_gauge(p, obj->a, obj->b,
(int)progress);
}