3 files changed, 62 insertions, 0 deletions
diff --git a/src/common/Makefile b/src/common/Makefile
index 2f424a57353..113029bf7b9 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -46,6 +46,7 @@ LIBS += $(PTHREAD_LIBS)
 # If you add objects here, see also src/tools/msvc/Mkvcbuild.pm
 
 OBJS_COMMON = \
+	archive.o \
 	base64.o \
 	checksum_helper.o \
 	compression.o \
diff --git a/src/common/archive.c b/src/common/archive.c
new file mode 100644
index 00000000000..641a58ee888
--- /dev/null
+++ b/src/common/archive.c
@@ -0,0 +1,60 @@
+/*-------------------------------------------------------------------------
+ *
+ * archive.c
+ *	  Common WAL archive routines
+ *
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/common/archive.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef FRONTEND
+#include "postgres.h"
+#else
+#include "postgres_fe.h"
+#endif
+
+#include "common/archive.h"
+#include "common/percentrepl.h"
+
+/*
+ * BuildRestoreCommand
+ *
+ * Builds a restore command to retrieve a file from WAL archives, replacing
+ * the supported aliases with values supplied by the caller as defined by
+ * the GUC parameter restore_command: xlogpath for %p, xlogfname for %f and
+ * lastRestartPointFname for %r.
+ *
+ * The result is a palloc'd string for the restore command built.  The
+ * caller is responsible for freeing it.  If any of the required arguments
+ * is NULL and that the corresponding alias is found in the command given
+ * by the caller, then an error is thrown.
+ */
+char *
+BuildRestoreCommand(const char *restoreCommand,
+					const char *xlogpath,
+					const char *xlogfname,
+					const char *lastRestartPointFname)
+{
+	char	   *nativePath = NULL;
+	char	   *result;
+
+	if (xlogpath)
+	{
+		nativePath = pstrdup(xlogpath);
+		make_native_path(nativePath);
+	}
+
+	result = replace_percent_placeholders(restoreCommand, "restore_command", "frp",
+										  xlogfname, lastRestartPointFname, nativePath);
+
+	if (nativePath)
+		pfree(nativePath);
+
+	return result;
+}
diff --git a/src/common/meson.build b/src/common/meson.build
index 1caa1fed043..41bd58ebdf1 100644
--- a/src/common/meson.build
+++ b/src/common/meson.build
@@ -1,6 +1,7 @@
 # Copyright (c) 2022-2023, PostgreSQL Global Development Group
 
 common_sources = files(
+  'archive.c',
   'base64.c',
   'checksum_helper.c',
   'compression.c',