Woops. Previous patch to remove -X options missed getopt_long calls().

robertmhaas · robertmhaas · commit f78ba0a73a60 · 2011-03-18T21:23:28.000-04:00
Noted by Tom Lane.
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -365,7 +365,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	while ((c = getopt_long(argc, argv, "abcCE:f:F:h:in:N:oOp:RsS:t:T:U:vwWxX:Z:",
+	while ((c = getopt_long(argc, argv, "abcCE:f:F:h:in:N:oOp:RsS:t:T:U:vwWxZ:",
 							long_options, &optindex)) != -1)
 	{
 		switch (c)
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -185,7 +185,7 @@ main(int argc, char *argv[])
 
 	pgdumpopts = createPQExpBuffer();
 
-	while ((c = getopt_long(argc, argv, "acf:gh:il:oOp:rsS:tU:vwWxX:", long_options, &optindex)) != -1)
+	while ((c = getopt_long(argc, argv, "acf:gh:il:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)
 	{
 		switch (c)
 		{
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -144,7 +144,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	while ((c = getopt_long(argc, argv, "acCd:ef:F:h:iI:j:lL:n:Op:P:RsS:t:T:U:vwWxX:1",
+	while ((c = getopt_long(argc, argv, "acCd:ef:F:h:iI:j:lL:n:Op:P:RsS:t:T:U:vwWx1",
 							cmdopts, NULL)) != -1)
 	{
 		switch (c)

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ main(int argc, char **argv)`
`365`	`365`	`}`
`366`	`366`	`}`
`367`	`367`
`368`		`- while ((c = getopt_long(argc, argv, "abcCE:f:F:h:in:N:oOp:RsS:t:T:U:vwWxX:Z:",`
	`368`	`+ while ((c = getopt_long(argc, argv, "abcCE:f:F:h:in:N:oOp:RsS:t:T:U:vwWxZ:",`
`369`	`369`	`long_options, &optindex)) != -1)`
`370`	`370`	`{`
`371`	`371`	`switch (c)`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ main(int argc, char *argv[])`
`185`	`185`
`186`	`186`	`pgdumpopts = createPQExpBuffer();`
`187`	`187`
`188`		`- while ((c = getopt_long(argc, argv, "acf:gh:il:oOp:rsS:tU:vwWxX:", long_options, &optindex)) != -1)`
	`188`	`+ while ((c = getopt_long(argc, argv, "acf:gh:il:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)`
`189`	`189`	`{`
`190`	`190`	`switch (c)`
`191`	`191`	`{`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ main(int argc, char **argv)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`- while ((c = getopt_long(argc, argv, "acCd:ef:F:h:iI:j:lL:n:Op:P:RsS:t:T:U:vwWxX:1",`
	`147`	`+ while ((c = getopt_long(argc, argv, "acCd:ef:F:h:iI:j:lL:n:Op:P:RsS:t:T:U:vwWx1",`
`148`	`148`	`cmdopts, NULL)) != -1)`
`149`	`149`	`{`
`150`	`150`	`switch (c)`