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.

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 71aed1e0f1dea480c87e52aa0554c1b74713f62f..49ce20112ff39f8a8716f1159972d1d08f5088d9 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -335,7 +335,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;
        /* the default text domain is the backend's */
@@ -1103,7 +1110,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 */