From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 26 Nov 2011 14:27:11 +0000 (-0500)
Subject: Fix join_path_components() to not add a leading slash when joining to an
X-Git-Tag: REL9_2_BETA1~778
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd6dbc24ef1dc6b39a795b5e0e959cf500ad71d6;p=postgresql

Fix join_path_components() to not add a leading slash when joining to an
initial null string.

Per report from Robert Haas in testing psql \ir.
---

diff --git a/src/port/path.c b/src/port/path.c
index 13ca4f3f1c..9cb0b01644 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -212,7 +212,8 @@ join_path_components(char *ret_path,
 	}
 	if (*tail)
 		snprintf(ret_path + strlen(ret_path), MAXPGPATH - strlen(ret_path),
-				 "/%s", tail);
+				/* only add slash if there is something already in head */
+				 "%s%s", head[0] ? "/" : "", tail);
 }