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 7b9a62b00c97d7744a504afb135e433a88261e2c..428b4f9b6fd0a3a53d05db33830c887b294b401d 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -331,7 +331,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 */
@@ -1099,7 +1106,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 */