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 6e8e5aef4e0fe2f2771e38396b1c70827056e699..8471d92f57fa86c657288fe01031ddb56d19231e 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -342,7 +342,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 */
@@ -1141,7 +1148,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 */