postgres.git / summary / log / commit / refs

commit    74f02254c5c2b8f0bca49ed482b1c82899290ca5
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Tue Nov 29 20:04:59 2011 +0000
First released in: 9.2.0, 8.2.23, 8.3.17, 8.4.10, 9.0.6, 9.1.2

    Strip file names reported in error messages in vpath builds
    
    In vpath builds, the __FILE__ macro that is used in verbose error
    reports contains the full absolute file name, which makes the error
    messages excessively verbose.  So keep only the base name, thus
    matching the behavior of non-vpath builds.


 src/backend/utils/error/elog.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 7bba9445abc..9a388f0f3b1 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -313,7 +313,14 @@ errstart(int elevel, const char *filename, int lineno,
 	edata->elevel = elevel;
 	edata->output_to_server = output_to_server;
 	edata->output_to_client = output_to_client;
-	edata->filename = filename;
+	if (filename)
+	{
+		const char *slash;
+
+		/* keep only base name, useful especially for vpath builds */
+		slash = strrchr(filename, '/');
+		edata->filename = slash ? slash + 1 : filename;
+	}
 	edata->lineno = lineno;
 	edata->funcname = funcname;
 	/* Select default errcode based on elevel */
@@ -950,7 +957,14 @@ elog_start(const char *filename, int lineno, const char *funcname)
 	}
 
 	edata = &errordata[errordata_stack_depth];
-	edata->filename = filename;
+	if (filename)
+	{
+		const char *slash;
+
+		/* keep only base name, useful especially for vpath builds */
+		slash = strrchr(filename, '/');
+		edata->filename = slash ? slash + 1 : filename;
+	}
 	edata->lineno = lineno;
 	edata->funcname = funcname;
 	/* errno is saved now so that error parameter eval can't change it */


[parent: 322fc5cf569d]