Cause initdb to actually accept -s as intended, and fix some typos in

tglsfdc · tglsfdc · commit 250e51605109 · 2004-08-11T23:28:54.000Z
a comment.

Jon Jensen
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.48 2004/08/11 11:06:23 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.49 2004/08/11 23:28:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2049,7 +2049,7 @@ main(int argc, char *argv[])
 
 	/* process command-line options */
 
-	while ((c = getopt_long(argc, argv, "dD:E:L:nU:WA:", long_options, &option_index)) != -1)
+	while ((c = getopt_long(argc, argv, "dD:E:L:nU:WA:s", long_options, &option_index)) != -1)
 	{
 		switch (c)
 		{
@@ -2198,8 +2198,8 @@ main(int argc, char *argv[])
 
 	/*
 	 * we have to set PGDATA for postgres rather than pass it on the
-	 * commnd line to avoid dumb quoting problems on Windows, and we would
-	 * expecially need quotes otherwise on Windows because paths there are
+	 * command line to avoid dumb quoting problems on Windows, and we would
+	 * especially need quotes otherwise on Windows because paths there are
 	 * most likely to have embedded spaces.
 	 */
 	pgdenv = xmalloc(8 + strlen(pg_data));

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`* Portions Copyright (c) 1994, Regents of the University of California`
`40`	`40`	`* Portions taken from FreeBSD.`
`41`	`41`	`*`
`42`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.48 2004/08/11 11:06:23 petere Exp $`
	`42`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.49 2004/08/11 23:28:54 tgl Exp $`
`43`	`43`	`*`
`44`	`44`	`*-------------------------------------------------------------------------`
`45`	`45`	`*/`
`@@ -2049,7 +2049,7 @@ main(int argc, char *argv[])`
`2049`	`2049`
`2050`	`2050`	`/* process command-line options */`
`2051`	`2051`
`2052`		`- while ((c = getopt_long(argc, argv, "dD:E:L:nU:WA:", long_options, &option_index)) != -1)`
	`2052`	`+ while ((c = getopt_long(argc, argv, "dD:E:L:nU:WA:s", long_options, &option_index)) != -1)`
`2053`	`2053`	`{`
`2054`	`2054`	`switch (c)`
`2055`	`2055`	`{`
`@@ -2198,8 +2198,8 @@ main(int argc, char *argv[])`
`2198`	`2198`
`2199`	`2199`	`/*`
`2200`	`2200`	`* we have to set PGDATA for postgres rather than pass it on the`
`2201`		`- * commnd line to avoid dumb quoting problems on Windows, and we would`
`2202`		`- * expecially need quotes otherwise on Windows because paths there are`
	`2201`	`+ * command line to avoid dumb quoting problems on Windows, and we would`
	`2202`	`+ * especially need quotes otherwise on Windows because paths there are`
`2203`	`2203`	`* most likely to have embedded spaces.`
`2204`	`2204`	`*/`
`2205`	`2205`	`pgdenv = xmalloc(8 + strlen(pg_data));`