Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

conf: Return an error if zlog_init is called with a non-regular file #279

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

conf: Return an error if zlog_init is called with a non-regular file #279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
#include "rotater.h"
#include "zc_defs.h"

#ifdef _WIN32
#define STATS_FILE stat
#else
#define STATS_FILE lstat
#endif

/*******************************************************************************/
#define ZLOG_CONF_DEFAULT_FORMAT "default = \"%D %V [%p:%F:%L] %m%n\""
#define ZLOG_CONF_DEFAULT_RULE "*.* >stdout"
Expand Down Expand Up @@ -471,11 +465,17 @@ static int zlog_conf_build_with_file(zlog_conf_t * a_conf)
int section = 0;
/* [global:1] [levels:2] [formats:3] [rules:4] */

if (STATS_FILE(a_conf->file, &a_stat)) {
if (stat(a_conf->file, &a_stat)) {
zc_error("lstat conf file[%s] fail, errno[%d]", a_conf->file,
errno);
return -1;
}

if (!S_ISREG(a_stat.st_mode)) {
zc_error("conf file[%s] is not a regular file", a_conf->file);
return -1;
}

localtime_r(&(a_stat.st_mtime), &local_time);
strftime(a_conf->mtime, sizeof(a_conf->mtime), "%Y-%m-%d %H:%M:%S", &local_time);

Expand Down