lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.7.3

Browse source
This commit is contained in:
Arnaud Quette 2015-04-30 15:53:36 +02:00
parent a356b56d11
commit fd413a3168
283 changed files with 14978 additions and 6511 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/apcsmart.c
View file

@ -1004,7 +1004,7 @@ static void apc_getcaps(int qco)
/* make sure setvar knows what this is */
vt->flags |= APC_RW | APC_ENUM;
} else if (vt->flags & APC_PACK)
} else if (vt && (vt->flags & APC_PACK))
/*
* Currently we assume - basing on the following
* feedback:
@ -1208,7 +1208,7 @@ static int getbaseinfo(void)
{
unsigned int i;
int ret, qco;
char *cmds, temp[APC_LBUF];
char *cmds, *tail, temp[APC_LBUF];
/*
* try firmware lookup first; we could start with 'a', but older models
@ -1243,9 +1243,16 @@ static int getbaseinfo(void)
/*
* returned set is verified for validity above, so just extract
* what's interesting for us
*
* the known format is:
* ver.alerts.commands[.stuff]
*/
cmds = strrchr(temp, '.');
for (i = 1; i < strlen(cmds); i++)
cmds = strchr(temp, '.');
cmds = strchr(cmds + 1, '.');
tail = strchr(++cmds, '.');
if (tail)
*tail = 0;
for (i = 0; i < strlen(cmds); i++)
protocol_verify(cmds[i]);
deprecate_vars();
@ -1691,7 +1698,7 @@ static int setvar_enum(apc_vartab_t *vt, const char *val)
return STAT_SET_HANDLED; /* FUTURE: no change */
}
for (i = 0; i < 6; i++) {
for (i = 0; i < 32; i++) {
if (apc_write(APC_NEXTVAL) != 1)
return STAT_SET_FAILED;