Generate optstrings automatically

src/bin/pgcopydb/cli_common.c

@@ -576,6 +576,34 @@ cli_read_one_line(const char *filename,
 }
 
 
+/*
+ * construct_optstring constructs the optstring for getopt_long based on the
+ * long_options array.
+ */
+char *
+construct_optstring(struct option *long_options)
+{
+	PQExpBuffer buf = createPQExpBuffer();
+
+	while (long_options->name != NULL)
+	{
+		appendPQExpBufferChar(buf, long_options->val);
+
+		if (long_options->has_arg)
+		{
+			appendPQExpBufferChar(buf, ':');
+		}
+
+		long_options++;
+	}
+
+	char *optstring = strdup(buf->data);
+	destroyPQExpBuffer(buf);
+
+	return optstring;
+}
+
+
 /*
  * cli_copy_db_getopts parses the CLI options for the `copy db` command.
  */
@@ -650,8 +678,7 @@ cli_copy_db_getopts(int argc, char **argv)
 		exit(EXIT_CODE_BAD_ARGS);
 	}
 
-	const char *optstring =
-		"S:T:D:J:I:b:L:u:mcAPOXj:xBeMlUagkyF:F:Q:irRCN:fp:ws:o:tE:Vvdzqh";
+	const char *optstring = construct_optstring(long_options);
 
 	while ((c = getopt_long(argc, argv,
 							optstring, long_options, &option_index)) != -1)

src/bin/pgcopydb/cli_common.h

@@ -128,4 +128,6 @@ bool cli_parse_bytes_pretty(const char *byteString,
 
 bool cli_prepare_pguris(ConnStrings *connStrings);
 
+char * construct_optstring(struct option *long_options);
+
 #endif  /* CLI_COMMON_H */

src/bin/pgcopydb/cli_compare.c

@@ -103,7 +103,9 @@ cli_compare_getopts(int argc, char **argv)
 	SplitTableLargerThan empty = { 0 };
 	options.splitTablesLargerThan = empty;
 
-	while ((c = getopt_long(argc, argv, "S:T:D:j:JVvdzqh",
+	const char *optstring = construct_optstring(long_options);
+
+	while ((c = getopt_long(argc, argv, optstring,
 							long_options, &option_index)) != -1)
 	{
 		switch (c)

src/bin/pgcopydb/cli_dump.c

@@ -107,7 +107,9 @@ cli_dump_schema_getopts(int argc, char **argv)
 		exit(EXIT_CODE_BAD_ARGS);
 	}
 
-	while ((c = getopt_long(argc, argv, "S:T:D:PrReFCNVvdzqh",
+	const char *optstring = construct_optstring(long_options);
+
+	while ((c = getopt_long(argc, argv, optstring,
 							long_options, &option_index)) != -1)
 	{
 		switch (c)

src/bin/pgcopydb/cli_list.c

@@ -294,7 +294,7 @@ cli_list_db_getopts(int argc, char **argv)
 		exit(EXIT_CODE_BAD_ARGS);
 	}
 
-	const char *optstring = "S:D:s:t:F:xPL:u:k:mfyarJRIN:Vdzvqh";
+	const char *optstring = construct_optstring(long_options);
 
 	while ((c = getopt_long(argc, argv, optstring,
 							long_options, &option_index)) != -1)

src/bin/pgcopydb/cli_ping.c

@@ -62,7 +62,9 @@ cli_ping_getopts(int argc, char **argv)
 		exit(EXIT_CODE_BAD_ARGS);
 	}
 
-	while ((c = getopt_long(argc, argv, "S:T:Vvdzqh",
+	const char *optstring = construct_optstring(long_options);
+
+	while ((c = getopt_long(argc, argv, optstring,
 							long_options, &option_index)) != -1)
 	{
 		switch (c)

src/bin/pgcopydb/cli_restore.c

@@ -189,7 +189,9 @@ cli_restore_schema_getopts(int argc, char **argv)
 		exit(EXIT_CODE_BAD_ARGS);
 	}
 
-	while ((c = getopt_long(argc, argv, "S:T:D:cOXj:xF:eErRCN:Vvdzqh",
+	const char *optstring = construct_optstring(long_options);
+
+	while ((c = getopt_long(argc, argv, optstring,
 							long_options, &option_index)) != -1)
 	{
 		switch (c)

src/bin/pgcopydb/cli_stream.c

@@ -235,7 +235,9 @@ cli_stream_getopts(int argc, char **argv)
 		exit(EXIT_CODE_BAD_ARGS);
 	}
 
-	while ((c = getopt_long(argc, argv, "S:T:D:p:ws:N:o:E:rRCOIVvdzqh",
+	const char *optstring = construct_optstring(long_options);
+
+	while ((c = getopt_long(argc, argv, optstring,
 							long_options, &option_index)) != -1)
 	{
 		switch (c)