DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-03 16:35:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

switch to new util file functions

Browse Source 
Replace all fopen(), rename(), and unlink() calls with the new util
functions.
This commit is contained in:
Miroslav Lichvar
2019-10-22 18:06:25 +02:00
parent 7dfd4ae556
commit e18903a6b5
10 changed files with 49 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
logging.c
View File

@@ -186,9 +186,7 @@ LOG_OpenFileLog(const char *log_file)
FILE *f;
if (log_file) {
f = fopen(log_file, "a");
if (!f)
LOG_FATAL("Could not open log file %s", log_file);
f = UTI_OpenFile(NULL, log_file, NULL, 'A', 0644);
} else {
f = stderr;
}
@@ -266,7 +264,7 @@ LOG_FileWrite(LOG_FileID id, const char *format, ...)
return;
if (!logfiles[id].file) {
char filename[PATH_MAX], *logdir = CNF_GetLogDir();
char *logdir = CNF_GetLogDir();
if (logdir[0] == '\0') {
LOG(LOGS_WARN, "logdir not specified");
@@ -274,16 +272,12 @@ LOG_FileWrite(LOG_FileID id, const char *format, ...)
return;
}
if (snprintf(filename, sizeof(filename), "%s/%s.log",
logdir, logfiles[id].name) >= sizeof (filename) ||
!(logfiles[id].file = fopen(filename, "a"))) {
LOG(LOGS_WARN, "Could not open log file %s", filename);
logfiles[id].file = UTI_OpenFile(logdir, logfiles[id].name, ".log", 'a', 0644);
if (!logfiles[id].file) {
/* Disable the log */
logfiles[id].name = NULL;
return;
}
/* Close on exec */
UTI_FdSetCloexec(fileno(logfiles[id].file));
}
banner = CNF_GetLogBanner();