diff options
Diffstat (limited to 'src/initlog.c')
| -rw-r--r-- | src/initlog.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/initlog.c b/src/initlog.c index 3b1cded6..19d9f9aa 100644 --- a/src/initlog.c +++ b/src/initlog.c @@ -51,7 +51,7 @@ struct logInfo *logData = NULL; void readConfiguration(char *fname) { int fd,num=0; struct stat sbuf; - char *data,*line; + char *data,*line, *d; regex_t *regexp; int lfac=-1,lpri=-1; @@ -60,7 +60,7 @@ void readConfiguration(char *fname) { close(fd); return; } - data=malloc(sbuf.st_size+1); + d = data=malloc(sbuf.st_size+1); if (read(fd,data,sbuf.st_size)!=sbuf.st_size) { close(fd); free(data); @@ -110,6 +110,7 @@ void readConfiguration(char *fname) { } if (lfac!=-1) logfacility=lfac; if (lpri!=-1) logpriority=lpri; + free(d); } char *getLine(char **data) { @@ -279,7 +280,7 @@ int logEvent(char *cmd, int eventtype,char *string) { /* insert more here */ NULL }; - int x=0,len; + int x=0,len, rc; struct logInfo logentry; if (cmd) { @@ -290,8 +291,10 @@ int logEvent(char *cmd, int eventtype,char *string) { logentry.cmd+=3; } else logentry.cmd = strdup(_("(none)")); - if (!string) - string = strdup(cmd); + if (!string) { + string = alloca(strlen(cmd)+1); + strcpy(string,cmd); + } while (eventtable[x] && x<eventtype) x++; if (!(eventtable[x])) x=0; @@ -303,11 +306,15 @@ int logEvent(char *cmd, int eventtype,char *string) { logentry.pri = logpriority; logentry.fac = logfacility; - return logLine(&logentry); + rc = logLine(&logentry); + free(logentry.line); + free(logentry.cmd); + return rc; } int logString(char *cmd, char *string) { struct logInfo logentry; + int rc; if (cmd) { logentry.cmd = strdup(basename(cmd)); @@ -321,7 +328,10 @@ int logString(char *cmd, char *string) { logentry.pri = logpriority; logentry.fac = logfacility; - return logLine(&logentry); + rc = logLine(&logentry); + free(logentry.line); + free(logentry.cmd); + return rc; } int processArgs(int argc, char **argv, int silent) { |