Fix join_path_components() to not add a leading slash when joining to an

bmomjian · bmomjian · commit fd6dbc24ef1d · 2011-11-26T09:27:11.000-05:00
initial null string.

Per report from Robert Haas in testing psql \ir.
diff --git 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);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,8 @@ join_path_components(char *ret_path,`
`212`	`212`	`}`
`213`	`213`	`if (*tail)`
`214`	`214`	`snprintf(ret_path + strlen(ret_path), MAXPGPATH - strlen(ret_path),`
`215`		`- "/%s", tail);`
	`215`	`+ /* only add slash if there is something already in head */`
	`216`	`+ "%s%s", head[0] ? "/" : "", tail);`
`216`	`217`	`}`
`217`	`218`
`218`	`219`