summaryrefslogtreecommitdiffstats
path: root/grammar/rainerscript.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-11-20 14:31:35 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-11-20 14:31:35 +0100
commit4a857f4629d5ca4ff4c59875bc798e70b1811ba9 (patch)
treed5ed999b663d9411fc163b5ff5669ac140a104c2 /grammar/rainerscript.c
parent9c25e344f2734c7f82fdad43c2fd88e91b27c315 (diff)
downloadrsyslog-4a857f4629d5ca4ff4c59875bc798e70b1811ba9.tar.gz
rsyslog-4a857f4629d5ca4ff4c59875bc798e70b1811ba9.tar.bz2
rsyslog-4a857f4629d5ca4ff4c59875bc798e70b1811ba9.zip
improve $IncludeConfig error messages
Diffstat (limited to 'grammar/rainerscript.c')
-rw-r--r--grammar/rainerscript.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index 1116c913..0dc505a7 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -2770,6 +2770,7 @@ cnfDoInclude(char *name)
glob_t cfgFiles;
struct stat fileInfo;
char nameBuf[MAXFNAME+1];
+ char cwdBuf[MAXFNAME+1];
finalName = name;
if(stat(name, &fileInfo) == 0) {
@@ -2793,8 +2794,9 @@ cnfDoInclude(char *name)
if(result == GLOB_NOSPACE || result == GLOB_ABORTED) {
char errStr[1024];
rs_strerror_r(errno, errStr, sizeof(errStr));
- parser_errmsg("error accessing config file or directory '%s': %s",
- finalName, errStr);
+ getcwd(cwdBuf, sizeof(cwdBuf));
+ parser_errmsg("error accessing config file or directory '%s' [cwd:%s]: %s",
+ finalName, cwdBuf, errStr);
return 1;
}
@@ -2803,8 +2805,9 @@ cnfDoInclude(char *name)
if(stat(cfgFile, &fileInfo) != 0) {
char errStr[1024];
rs_strerror_r(errno, errStr, sizeof(errStr));
- parser_errmsg("error accessing config file or directory '%s': %s",
- cfgFile, errStr);
+ getcwd(cwdBuf, sizeof(cwdBuf));
+ parser_errmsg("error accessing config file or directory '%s' "
+ "[cwd: %s]: %s", cfgFile, cwdBuf, errStr);
return 1;
}