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

Imported Upstream version 2.6.0

Browse source
This commit is contained in:
arnaud.quette@free.fr 2011-01-26 10:35:08 +01:00
parent 26fb71b504
commit 459aaf9392
510 changed files with 40508 additions and 18859 deletions
Download patch file Download diff file Expand all files Collapse all files

28
clients/upssched.c
View file

@ -50,14 +50,14 @@
#include "upssched.h"
#include "timehead.h"
typedef struct {
typedef struct ttype_s {
char *name;
time_t etime;
void *next;
} ttype_t;
struct ttype_s *next;
} ttype_t;
ttype_t *thead = NULL;
static struct conn_t *connhead = NULL;
static conn_t *connhead = NULL;
char *cmdscript = NULL, *pipefn = NULL, *lockfn = NULL;
int verbose = 0; /* use for debugging */
@ -300,9 +300,9 @@ static int open_sock(void)
return fd;
}
static void conn_del(struct conn_t *target)
static void conn_del(conn_t *target)
{
struct conn_t *tmp, *last = NULL;
conn_t *tmp, *last = NULL;
tmp = connhead;
@ -327,7 +327,7 @@ static void conn_del(struct conn_t *target)
upslogx(LOG_ERR, "Tried to delete a bogus state connection");
}
static int send_to_one(struct conn_t *conn, const char *fmt, ...)
static int send_to_one(conn_t *conn, const char *fmt, ...)
{
int ret;
va_list ap;
@ -354,7 +354,7 @@ static int send_to_one(struct conn_t *conn, const char *fmt, ...)
static void conn_add(int sockfd)
{
int acc, ret;
struct conn_t *tmp, *last;
conn_t *tmp, *last;
struct sockaddr_un saddr;
socklen_t salen;
@ -391,7 +391,7 @@ static void conn_add(int sockfd)
tmp = tmp->next;
}
tmp = xmalloc(sizeof(struct conn_t));
tmp = xmalloc(sizeof(conn_t));
tmp->fd = acc;
tmp->next = NULL;
@ -405,7 +405,7 @@ static void conn_add(int sockfd)
pconf_init(&tmp->ctx, NULL);
}
static int sock_arg(struct conn_t *conn)
static int sock_arg(conn_t *conn)
{
if (conn->ctx.numargs < 1)
return 0;
@ -446,7 +446,7 @@ static void log_unknown(int numarg, char **arg)
upslogx(LOG_INFO, "arg %d: %s", i, arg[i]);
}
static int sock_read(struct conn_t *conn)
static int sock_read(conn_t *conn)
{
int i, ret;
char ch;
@ -494,7 +494,7 @@ static void start_daemon(int lockfd)
int maxfd, pid, pipefd, ret;
struct timeval tv;
fd_set rfds;
struct conn_t *tmp, *tmpnext;
conn_t *tmp, *tmpnext;
socklen_t fromlen;
fromlen = sizeof(struct sockaddr);
@ -899,10 +899,12 @@ static void checkconf(void)
int main(int argc, char **argv)
{
const char *prog = xbasename(argv[0]);
verbose = 1; /* TODO: remove when done testing */
/* normally we don't have stderr, so get this going to syslog early */
openlog("upssched", LOG_PID, LOG_DAEMON);
open_syslog(prog);
syslogbit_set();
upsname = getenv("UPSNAME");