Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-10 18:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with fprintf and buffer containing "%"

Browse Source 
SVN revision: 1529
This commit is contained in:
Stefan Ritt 2005-10-25 18:26:34 +00:00
parent dc6bc28616
commit 63b2764c0b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elogd.c
View File

@ -4765,7 +4765,7 @@ void write_logfile(LOGBOOK * lbs, const char *format, ...)
char file_name[2000]; char file_name[2000];
va_list argptr; va_list argptr;
char str[10000]; char str[10000];
FILE *f; int fh;
time_t now; time_t now;
char buf[10000]; char buf[10000];
@ -4786,9 +4786,10 @@ void write_logfile(LOGBOOK * lbs, const char *format, ...)
vsprintf(str, (char *) format, argptr); vsprintf(str, (char *) format, argptr);
va_end(argptr); va_end(argptr);
f = fopen(file_name, "a"); fh = open(file_name, O_RDWR | O_BINARY | O_CREAT | O_APPEND, 0644);
if (!f) if (fh < 0)
return; return;
//lseek(fh, 0, SEEK_END);
now = time(0); now = time(0);
strftime(buf, sizeof(buf), "%d-%b-%Y %H:%M:%S", localtime(&now)); strftime(buf, sizeof(buf), "%d-%b-%Y %H:%M:%S", localtime(&now));
@ -4806,9 +4807,9 @@ void write_logfile(LOGBOOK * lbs, const char *format, ...)
if (buf[strlen(buf) - 1] != '\n') if (buf[strlen(buf) - 1] != '\n')
strlcat(buf, "\n", sizeof(buf)); strlcat(buf, "\n", sizeof(buf));
fprintf(f, buf); write(fh, buf, strlen(buf));
fclose(f); close(fh);
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@ -22873,7 +22874,7 @@ void server_loop(void)
strlcpy(str, net_buffer, sizeof(str)); strlcpy(str, net_buffer, sizeof(str));
if (strchr(str, '\r')) if (strchr(str, '\r'))
*strchr(str, '\r') = 0; *strchr(str, '\r') = 0;
write_logfile(NULL, "%s: %s", rem_host, str); write_logfile(NULL, "%s", str);
} }
memset(return_buffer, 0, return_buffer_size); memset(return_buffer, 0, return_buffer_size);