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

27
drivers/main.c
View file

@ -31,6 +31,9 @@
/* for ser_open */
int do_lock_port = 1;
/* for dstate->sock_connect, default to asynchronous */
int do_synchronous = 0;
/* for detecting -a values that don't match anything */
static int upsname_found = 0;
@ -250,7 +253,7 @@ void addvar(int vartype, const char *name, const char *desc)
/* handle -x / ups.conf config details that are for this part of the code */
static int main_arg(char *var, char *val)
{
/* flags for main: just 'nolock' for now */
/* flags for main */
if (!strcmp(var, "nolock")) {
do_lock_port = 0;
@ -281,6 +284,16 @@ static int main_arg(char *var, char *val)
return 1; /* handled */
}
/* allow per-driver overrides of the global setting */
if (!strcmp(var, "synchronous")) {
if (!strcmp(val, "yes"))
do_synchronous=1;
else
do_synchronous=0;
return 1; /* handled */
}
/* only for upsdrvctl - ignored here */
if (!strcmp(var, "sdorder"))
return 1; /* handled */
@ -309,6 +322,13 @@ static void do_global_args(const char *var, const char *val)
user = xstrdup(val);
}
if (!strcmp(var, "synchronous")) {
if (!strcmp(val, "yes"))
do_synchronous=1;
else
do_synchronous=0;
}
/* unrecognized */
}
@ -519,6 +539,7 @@ int main(int argc, char **argv)
chroot_path = xstrdup(optarg);
break;
case 'u':
free(user);
user = xstrdup(optarg);
break;
case 'V':
@ -660,6 +681,10 @@ int main(int argc, char **argv)
/* The poll_interval may have been changed from the default */
dstate_setinfo("driver.parameter.pollinterval", "%d", poll_interval);
/* The synchronous option may have been changed from the default */
dstate_setinfo("driver.parameter.synchronous", "%s",
(do_synchronous==1)?"yes":"no");
/* remap the device.* info from ups.* for the transition period */
if (dstate_getinfo("ups.mfr") != NULL)
dstate_setinfo("device.mfr", "%s", dstate_getinfo("ups.mfr"));