From 5ab7579870f9d2dee1b707c0914308823479f51c Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 14 Oct 2025 16:55:04 +0900 Subject: [PATCH v2 3/3] pg_resetwal: use PG_VERSION generic routine --- src/bin/pg_resetwal/pg_resetwal.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c index 7a4e4eb95706..a89d72fc5cfe 100644 --- a/src/bin/pg_resetwal/pg_resetwal.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -55,6 +55,7 @@ #include "common/restricted_token.h" #include "common/string.h" #include "fe_utils/option_utils.h" +#include "fe_utils/version.h" #include "getopt_long.h" #include "pg_getopt.h" #include "storage/large_object.h" @@ -539,35 +540,18 @@ main(int argc, char *argv[]) static void CheckDataVersion(void) { - const char *ver_file = "PG_VERSION"; - FILE *ver_fd; - char rawline[64]; + char *version_str; + uint32 version = get_pg_version(".", &version_str); - if ((ver_fd = fopen(ver_file, "r")) == NULL) - pg_fatal("could not open file \"%s\" for reading: %m", - ver_file); - - /* version number has to be the first line read */ - if (!fgets(rawline, sizeof(rawline), ver_fd)) - { - if (!ferror(ver_fd)) - pg_fatal("unexpected empty file \"%s\"", ver_file); - else - pg_fatal("could not read file \"%s\": %m", ver_file); - } - - /* strip trailing newline and carriage return */ - (void) pg_strip_crlf(rawline); - - if (strcmp(rawline, PG_MAJORVERSION) != 0) + if (GET_PG_MAJORVERSION_NUM(version) != PG_MAJORVERSION_NUM) { pg_log_error("data directory is of wrong version"); pg_log_error_detail("File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\".", - ver_file, rawline, PG_MAJORVERSION); + "PG_VERSION", + version_str, + PG_MAJORVERSION); exit(1); } - - fclose(ver_fd); } -- 2.51.0