Fixed several small valgrind detected errors

This commit is contained in:
Michiel Broek
2003-12-16 21:50:32 +00:00
parent 2ab6cacda9
commit 2e58d4339a
19 changed files with 517 additions and 475 deletions

View File

@@ -352,7 +352,7 @@ void chat_cleanuser(pid_t pid)
void chat_msg(int channel, char *nick, char *msg)
{
int i;
char buf[128], *log;
char buf[128], *logm;
if (nick == NULL)
sprintf(buf, "%s", msg);
@@ -360,10 +360,10 @@ void chat_msg(int channel, char *nick, char *msg)
sprintf(buf, "<%s> %s", nick, msg);
if (CFG.iAutoLog && strlen(CFG.chat_log)) {
log = calloc(PATH_MAX, sizeof(char));
sprintf(log, "%s/log/%s", getenv("MBSE_ROOT"), CFG.chat_log);
ulog(log, (char *)"+", chat_channels[channel].name, (char *)"-1", buf);
free(log);
logm = calloc(PATH_MAX, sizeof(char));
sprintf(logm, "%s/log/%s", getenv("MBSE_ROOT"), CFG.chat_log);
ulog(logm, (char *)"+", chat_channels[channel].name, (char *)"-1", buf);
free(logm);
}
buf[79] = '\0';

View File

@@ -422,7 +422,7 @@ char *reg_ipm(char *data)
*/
int reg_spm(char *data)
{
char *cnt, *from, *too, *txt, *log;
char *cnt, *from, *too, *txt, *logm;
int i;
cnt = strtok(data, ",");
@@ -463,10 +463,10 @@ int reg_spm(char *data)
reginfo[i].ismsg = TRUE;
if (CFG.iAutoLog && strlen(CFG.chat_log)) {
log = calloc(PATH_MAX, sizeof(char));
sprintf(log, "%s/log/%s", getenv("MBSE_ROOT"), CFG.chat_log);
ulog(log, (char *)"+", from, (char *)"-1", txt);
free(log);
logm = calloc(PATH_MAX, sizeof(char));
sprintf(logm, "%s/log/%s", getenv("MBSE_ROOT"), CFG.chat_log);
ulog(logm, (char *)"+", from, (char *)"-1", txt);
free(logm);
}
Syslog('+', "reg_spm: rec=%d in=%d out=%d ismsg=%d", i, reginfo[i].ptr_in, reginfo[i].ptr_out, reginfo[i].ismsg);

View File

@@ -4,7 +4,7 @@
* Purpose ...............: MBSE BBS Task Manager, utilities
*
*****************************************************************************
* Copyright (C) 1997-2001
* Copyright (C) 1997-2003
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -194,30 +194,30 @@ void Syslog(int grade, const char *format, ...)
int ulog(char *fn, char *grade, char *prname, char *prpid, char *format)
{
int i, oldmask;
FILE *log;
FILE *fp;
oldmask = umask(066);
log = fopen(fn, "a");
fp = fopen(fn, "a");
umask(oldmask);
if (log == NULL) {
if (fp == NULL) {
oserr = errno;
Syslog('!', "$Cannot open user logfile %s", fn);
return -1;
}
fprintf(log, "%s %s %s[%s] ", grade, date(), prname, prpid);
fprintf(fp, "%s %s %s[%s] ", grade, date(), prname, prpid);
for (i = 0; i < strlen(format); i++) {
if (iscntrl(format[i])) {
fputc('^', log);
fputc(format[i] + 64, log);
fputc('^', fp);
fputc(format[i] + 64, fp);
} else {
fputc(format[i], log);
fputc(format[i], fp);
}
}
fputc('\n', log);
fflush(log);
fputc('\n', fp);
fflush(fp);
if (fclose(log) != 0) {
if (fclose(fp) != 0) {
oserr = errno;
Syslog('!', "$Cannot close user logfile %s", fn);
return -1;