[packages/postgresql.git] / postgresql-pg_ctl-fix.patch

--- postgresql-8.3.0/src/bin/pg_ctl/pg_ctl.c.orig	2008-01-01 20:45:55.000000000 +0100
+++ postgresql-8.3.0/src/bin/pg_ctl/pg_ctl.c	2008-02-19 21:30:21.369174813 +0100
@@ -414,11 +414,11 @@
 	PGconn	   *conn;
 	bool		success = false;
 	int			i;
-	char		portstr[32];
+	char		portstr[32], sockstr[MAXPGPATH];
 	char	   *p;
-	char		connstr[128];	/* Should be way more than enough! */
+	char		connstr[128+MAXPGPATH];	/* Should be way more than enough! */
 
-	*portstr = '\0';
+	*portstr = *sockstr = '\0';
 
 	/* post_opts */
 	for (p = post_opts; *p;)
@@ -436,6 +436,15 @@
 			strlcpy(portstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1,
 									sizeof(portstr)));
 			/* keep looking, maybe there is another -p */
+		} else if (strncmp(p, "-k", strlen("-k")) == 0)
+		{
+			p += strlen("-k");
+			/* advance past whitespace/quoting */
+			while (isspace((unsigned char) *p) || *p == '\'' || *p == '"')
+				p++;
+			strlcpy(sockstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1,
+									sizeof(sockstr)));
+			/* keep looking, maybe there is another -k */
 		}
 		/* Advance to next whitespace */
 		while (*p && !isspace((unsigned char) *p))
@@ -443,7 +452,7 @@
 	}
 
 	/* config file */
-	if (!*portstr)
+	if (!*portstr || !*sockstr)
 	{
 		char	  **optlines;
 
@@ -456,19 +465,30 @@
 
 				while (isspace((unsigned char) *p))
 					p++;
-				if (strncmp(p, "port", strlen("port")) != 0)
-					continue;
-				p += strlen("port");
-				while (isspace((unsigned char) *p))
+				if (!strncmp(p, "port", strlen("port"))) {
+					p += strlen("port");
+					while (isspace((unsigned char) *p))
+						p++;
+					if (*p != '=')
+						continue;
 					p++;
-				if (*p != '=')
-					continue;
-				p++;
-				while (isspace((unsigned char) *p))
+					while (isspace((unsigned char) *p))
+						p++;
+					strlcpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1,
+											sizeof(portstr)));
+					/* keep looking, maybe there is another */
+				} else if(!strncmp(p, "unix_socket_directory", strlen("unix_socket_directory"))) {
+					p += strlen("unix_socket_directory");
+					while (isspace((unsigned char) *p))
+						p++;
+					if (*p != '=')
+						continue;
 					p++;
-				strlcpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1,
-										sizeof(portstr)));
-				/* keep looking, maybe there is another */
+					while (isspace((unsigned char) *p) || *p == '\'' || *p == '"')
+						p++;
+					strlcpy(sockstr, p, Min(strcspn(p, "\"'#" WHITESPACE) + 1,
+											sizeof(sockstr)));
+				}
 			}
 		}
 	}
@@ -486,7 +506,8 @@
 	 * probably timeout first
 	 */
 	snprintf(connstr, sizeof(connstr),
-			 "dbname=postgres port=%s connect_timeout=5", portstr);
+			 "dbname=postgres port=%s connect_timeout=5%s%s", portstr,
+			 (*sockstr ? " host=" : ""), sockstr);
 
 	for (i = 0; i < wait_seconds; i++)
 	{
Commit	Line	Data
4aa5c0b3 JB	1	--- postgresql-8.3.0/src/bin/pg_ctl/pg_ctl.c.orig 2008-01-01 20:45:55.000000000 +0100
	2	+++ postgresql-8.3.0/src/bin/pg_ctl/pg_ctl.c 2008-02-19 21:30:21.369174813 +0100
	3	@@ -414,11 +414,11 @@
	4	PGconn *conn;
0796510c	5	bool success = false;
0796510c	6	int i;
4aa5c0b3 JB	7	- char portstr[32];
4aa5c0b3 JB	8	+ char portstr[32], sockstr[MAXPGPATH];
0796510c	9	char *p;
4aa5c0b3 JB	10	- char connstr[128]; /* Should be way more than enough! */
4aa5c0b3 JB	11	+ char connstr[128+MAXPGPATH]; /* Should be way more than enough! */
0796510c	12
4aa5c0b3 JB	13	- *portstr = '\0';
4aa5c0b3 JB	14	+ portstr = sockstr = '\0';
0796510c	15
	16	/* post_opts */
	17	for (p = post_opts; *p;)
4aa5c0b3 JB	18	@@ -436,6 +436,15 @@
	19	strlcpy(portstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1,
	20	sizeof(portstr)));
	21	/* keep looking, maybe there is another -p */
	22	+ } else if (strncmp(p, "-k", strlen("-k")) == 0)
	23	+ {
	24	+ p += strlen("-k");
	25	+ /* advance past whitespace/quoting */
	26	+ while (isspace((unsigned char) p) \|\| p == '\'' \|\| *p == '"')
	27	+ p++;
	28	+ strlcpy(sockstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1,
	29	+ sizeof(sockstr)));
	30	+ /* keep looking, maybe there is another -k */
	31	}
	32	/* Advance to next whitespace */
	33	while (p && !isspace((unsigned char) p))
	34	@@ -443,7 +452,7 @@
0796510c	35	}
	36
	37	/* config file */
	38	- if (!*portstr)
	39	+ if (!portstr \|\| !sockstr)
	40	{
	41	char **optlines;
	42
4aa5c0b3	43	@@ -456,19 +465,30 @@
0796510c	44
	45	while (isspace((unsigned char) *p))
	46	p++;
	47	- if (strncmp(p, "port", strlen("port")) != 0)
	48	- continue;
	49	- p += strlen("port");
	50	- while (isspace((unsigned char) *p))
4aa5c0b3	51	+ if (!strncmp(p, "port", strlen("port"))) {
0796510c	52	+ p += strlen("port");
	53	+ while (isspace((unsigned char) *p))
	54	+ p++;
	55	+ if (*p != '=')
	56	+ continue;
	57	p++;
4aa5c0b3 JB	58	- if (*p != '=')
	59	- continue;
	60	- p++;
	61	- while (isspace((unsigned char) *p))
0796510c	62	+ while (isspace((unsigned char) *p))
0796510c	63	+ p++;
4aa5c0b3 JB	64	+ strlcpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1,
	65	+ sizeof(portstr)));
	66	+ /* keep looking, maybe there is another */
	67	+ } else if(!strncmp(p, "unix_socket_directory", strlen("unix_socket_directory"))) {
0796510c	68	+ p += strlen("unix_socket_directory");
	69	+ while (isspace((unsigned char) *p))
	70	+ p++;
	71	+ if (*p != '=')
	72	+ continue;
4aa5c0b3 JB	73	p++;
	74	- strlcpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1,
	75	- sizeof(portstr)));
	76	- /* keep looking, maybe there is another */
0796510c	77	+ while (isspace((unsigned char) p) \|\| p == '\'' \|\| *p == '"')
0796510c	78	+ p++;
4aa5c0b3 JB	79	+ strlcpy(sockstr, p, Min(strcspn(p, "\"'#" WHITESPACE) + 1,
4aa5c0b3 JB	80	+ sizeof(sockstr)));
0796510c	81	+ }
0796510c	82	}
0796510c	83	}
4aa5c0b3 JB	84	}
	85	@@ -486,7 +506,8 @@
	86	* probably timeout first
	87	*/
	88	snprintf(connstr, sizeof(connstr),
	89	- "dbname=postgres port=%s connect_timeout=5", portstr);
	90	+ "dbname=postgres port=%s connect_timeout=5%s%s", portstr,
	91	+ (*sockstr ? " host=" : ""), sockstr);
0796510c	92
	93	for (i = 0; i < wait_seconds; i++)
	94	{