From b0ec61c9c27fb932ae6524f92a18e0d1fadbc144 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Thu, 14 Sep 2023 11:17:33 +0200 Subject: [PATCH] Quote filenames in error messages The majority of all filenames are quoted in user facing error and log messages, but a few were still printed without quotes. While these filenames do not risk causing any ambiguity as their format is strict, quote them anyways to be consistent across all logs. Also concatenate a message to keep it one line to make it easier to grep for in the code. Reviewed-by: Peter Eisentraut Reviewed-by: Michael Paquier Discussion: https://postgr.es/m/080EEABE-6645-4A46-AB20-6285ADAC44FE@yesql.se --- src/backend/access/transam/xlog.c | 3 +-- src/bin/pg_waldump/pg_waldump.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index f26c8d18a61..725a308debb 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -2248,8 +2248,7 @@ XLogWrite(XLogwrtRqst WriteRqst, TimeLineID tli, bool flexible) errno = save_errno; ereport(PANIC, (errcode_for_file_access(), - errmsg("could not write to log file %s " - "at offset %u, length %zu: %m", + errmsg("could not write to log file \"%s\" at offset %u, length %zu: %m", xlogfname, startoffset, nleft))); } nleft -= written; diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c index b9acfed3b7a..a3535bdfa9c 100644 --- a/src/bin/pg_waldump/pg_waldump.c +++ b/src/bin/pg_waldump/pg_waldump.c @@ -418,11 +418,11 @@ WALDumpReadPage(XLogReaderState *state, XLogRecPtr targetPagePtr, int reqLen, if (errinfo.wre_errno != 0) { errno = errinfo.wre_errno; - pg_fatal("could not read from file %s, offset %d: %m", + pg_fatal("could not read from file \"%s\", offset %d: %m", fname, errinfo.wre_off); } else - pg_fatal("could not read from file %s, offset %d: read %d of %d", + pg_fatal("could not read from file \"%s\", offset %d: read %d of %d", fname, errinfo.wre_off, errinfo.wre_read, errinfo.wre_req); } -- 2.39.5