pg_waldump: Fix error message for WAL files smaller than XLOG_BLCKSZ.

When opening a WAL file smaller than XLOG_BLCKSZ (e.g. 0 bytes long) while
determining the wal_segment_size, pg_waldump checked errno, despite errno not
being set by the short read. Resulting in a bogus error message.

Author: Kyotaro Horiguchi 
Discussion: https://postgr.es/m/20220214.181847.775024684568733277[email protected]
Backpatch: 11-, the bug was introducedin fc49e24fa

diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index a6251e1a961a6ca7d573a7a51f0de51e2efc5a71..2340dc247b0edaa45655cee0fc22b1b22684c67f 100644 (file)
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -222,15 +222,12 @@ search_directory(const char *directory, const char *fname)
                                     WalSegSz),
                            fname, WalSegSz);
        }
+       else if (r < 0)
+           fatal_error("could not read file \"%s\": %m",
+                       fname);
        else
-       {
-           if (errno != 0)
-               fatal_error("could not read file \"%s\": %m",
-                           fname);
-           else
-               fatal_error("could not read file \"%s\": read %d of %d",
-                           fname, r, XLOG_BLCKSZ);
-       }
+           fatal_error("could not read file \"%s\": read %d of %d",
+                       fname, r, XLOG_BLCKSZ);
        close(fd);
        return true;
    }