From 7d069a2b9178498293372913b0fa287005aa93b4 Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 19 Oct 2020 14:03:48 -0400 Subject: [PATCH] Remove indexed option constants. These constants don't scale well as the index total is increased for an option. The core code rarely uses these options and they are easily replaced with cfgOptionName(). The tests had started to make use of the constants, so provide functions that build the option name from the optionId and, optionally, the optionKey. --- build/lib/pgBackRestBuild/Config/Build.pm | 13 +- .../lib/pgBackRestBuild/Config/BuildParse.pm | 15 +- src/command/archive/common.c | 10 +- src/command/archive/push/push.c | 6 +- src/config/config.auto.c | 552 +++++------- src/config/config.auto.h | 276 ------ src/config/load.c | 6 +- src/config/parse.auto.c | 844 +++++++++--------- src/protocol/helper.c | 7 +- test/src/common/harnessConfig.c | 117 +++ test/src/common/harnessConfig.h | 43 + test/src/module/command/archiveCommonTest.c | 4 +- test/src/module/command/archiveGetTest.c | 16 +- test/src/module/command/archivePushTest.c | 10 +- test/src/module/command/backupTest.c | 164 ++-- test/src/module/command/checkTest.c | 4 +- test/src/module/command/controlTest.c | 2 +- test/src/module/command/localTest.c | 2 +- test/src/module/command/remoteTest.c | 2 +- test/src/module/command/repoTest.c | 108 +-- test/src/module/command/restoreTest.c | 4 +- test/src/module/config/loadTest.c | 16 +- test/src/module/config/parseTest.c | 68 +- test/src/module/config/protocolTest.c | 2 +- test/src/module/info/infoBackupTest.c | 2 +- test/src/module/protocol/protocolTest.c | 28 +- test/src/module/storage/azureTest.c | 30 +- test/src/module/storage/cifsTest.c | 2 +- test/src/module/storage/posixTest.c | 2 +- test/src/module/storage/s3Test.c | 50 +- 30 files changed, 1080 insertions(+), 1325 deletions(-) diff --git a/build/lib/pgBackRestBuild/Config/Build.pm b/build/lib/pgBackRestBuild/Config/Build.pm index 35ff1d22d..85e065001 100644 --- a/build/lib/pgBackRestBuild/Config/Build.pm +++ b/build/lib/pgBackRestBuild/Config/Build.pm @@ -275,7 +275,7 @@ sub buildConfig " //" . (qw{-} x 126) . "\n" . " CONFIG_OPTION\n" . " (\n" . - " CONFIG_OPTION_NAME(${strOptionConst})\n" . + " CONFIG_OPTION_NAME(\"${strOptionIndex}\")\n" . " CONFIG_OPTION_INDEX(" . ($iOptionIndex - 1) . ")\n" . " CONFIG_OPTION_DEFINE_ID(" . buildConfigDefineOptionEnum($strOption) . ")\n"; @@ -296,11 +296,14 @@ sub buildConfig " )\n"; - $rhBuild->{&BLD_FILE}{&BLDLCL_FILE_CONFIG}{&BLD_CONSTANT_GROUP}{&BLDLCL_CONSTANT_OPTION}{&BLD_CONSTANT} - {$strOptionConst}{&BLD_CONSTANT_VALUE} = "\"${strOptionIndex}\"\n STRING_DECLARE(${strOptionConst}_STR);"; + if (!$rhConfigDefine->{$strOption}{&CFGDEF_GROUP}) + { + $rhBuild->{&BLD_FILE}{&BLDLCL_FILE_CONFIG}{&BLD_CONSTANT_GROUP}{&BLDLCL_CONSTANT_OPTION}{&BLD_CONSTANT} + {$strOptionConst}{&BLD_CONSTANT_VALUE} = "\"${strOptionIndex}\"\n STRING_DECLARE(${strOptionConst}_STR);"; - $strBuildSourceConstant .= - "STRING_EXTERN(${strOptionConst}_STR," . (' ' x (49 - length($strOptionConst))) . "${strOptionConst});\n"; + $strBuildSourceConstant .= + "STRING_EXTERN(${strOptionConst}_STR," . (' ' x (49 - length($strOptionConst))) . "${strOptionConst});\n"; + } $iOptionTotal += 1; } diff --git a/build/lib/pgBackRestBuild/Config/BuildParse.pm b/build/lib/pgBackRestBuild/Config/BuildParse.pm index 26a6e8a98..dd8c7b989 100644 --- a/build/lib/pgBackRestBuild/Config/BuildParse.pm +++ b/build/lib/pgBackRestBuild/Config/BuildParse.pm @@ -130,8 +130,11 @@ sub buildConfigParse # Build option constant name if this is the current name for the option if ($iOptionNameIdx == 0) { - $strOptionConst = "CFGOPT_" . uc($strOptionNameOut); - $strOptionConst =~ s/\-/_/g; + if (!$rhConfigDefine->{$strOption}{&CFGDEF_GROUP}) + { + $strOptionConst = "CFGOPT_" . uc($strOptionNameOut); + $strOptionConst =~ s/\-/_/g; + } } # Else use bare string and mark as deprecated else @@ -145,7 +148,7 @@ sub buildConfigParse # Add option $strBuildSource .= " {\n" . - " .name = " . (defined($strOptionConst) ? $strOptionConst : "\"${strOptionNameOut}\"") . ",\n" . + " .name = \"${strOptionNameOut}\",\n" . $strOptionArg . " .val = ${strOptionFlag} ${strOptionVal},\n" . " },\n"; @@ -156,8 +159,7 @@ sub buildConfigParse { $strBuildSource .= " {\n" . - " .name = \"no-" . - (defined($strOptionConst) ? "\" ${strOptionConst}" : "${strOptionNameOut}\"") . ",\n" . + " .name = \"no-${strOptionNameOut}\",\n" . " .val = ${strOptionFlag} PARSE_NEGATE_FLAG | ${strOptionVal},\n" . " },\n"; } @@ -168,8 +170,7 @@ sub buildConfigParse { $strBuildSource .= " {\n" . - " .name = \"reset-" . - (defined($strOptionConst) ? "\" ${strOptionConst}" : "${strOptionNameOut}\"") . ",\n" . + " .name = \"reset-${strOptionNameOut}\",\n" . " .val = ${strOptionFlag} PARSE_RESET_FLAG | ${strOptionVal},\n" . " },\n"; } diff --git a/src/command/archive/common.c b/src/command/archive/common.c index 6d6b89403..85371fc08 100644 --- a/src/command/archive/common.c +++ b/src/command/archive/common.c @@ -333,10 +333,10 @@ walPath(const String *walFile, const String *pgPath, const String *command) { THROW_FMT( OptionRequiredError, - "option '" CFGOPT_PG1_PATH "' must be specified when relative wal paths are used\n" + "option '%s' must be specified when relative wal paths are used\n" "HINT: is %%f passed to %s instead of %%p?\n" "HINT: PostgreSQL may pass relative paths even with %%p depending on the environment.", - strZ(command)); + cfgOptionName(cfgOptPgPath), strZ(command)); } // Get the working directory @@ -359,9 +359,9 @@ walPath(const String *walFile, const String *pgPath, const String *command) { THROW_FMT( OptionInvalidValueError, - PG_NAME " working directory '%s' is not the same as option " CFGOPT_PG1_PATH " '%s'\n" - "HINT: is the " PG_NAME " data_directory configured the same as the " CFGOPT_PG1_PATH " option?", - currentWorkDir, strZ(pgPath)); + PG_NAME " working directory '%s' is not the same as option %s '%s'\n" + "HINT: is the " PG_NAME " data_directory configured the same as the %s option?", + currentWorkDir, cfgOptionName(cfgOptPgPath), strZ(pgPath), cfgOptionName(cfgOptPgPath)); } } diff --git a/src/command/archive/push/push.c b/src/command/archive/push/push.c index 5e41080f6..512229bb0 100644 --- a/src/command/archive/push/push.c +++ b/src/command/archive/push/push.c @@ -284,7 +284,11 @@ cmdArchivePush(void) // pg1-path is not optional for async mode if (!cfgOptionTest(cfgOptPgPath)) - THROW(OptionRequiredError, "'" CFGCMD_ARCHIVE_PUSH "' command in async mode requires option '" CFGOPT_PG1_PATH "'"); + { + THROW_FMT( + OptionRequiredError, "'" CFGCMD_ARCHIVE_PUSH "' command in async mode requires option '%s'", + cfgOptionName(cfgOptPgPath)); + } // Loop and wait for the WAL segment to be pushed Wait *wait = waitNew((TimeMSec)(cfgOptionDbl(cfgOptArchiveTimeout) * MSEC_PER_SEC)); diff --git a/src/config/config.auto.c b/src/config/config.auto.c index e567d044d..52d5d7a71 100644 --- a/src/config/config.auto.c +++ b/src/config/config.auto.c @@ -340,102 +340,6 @@ STRING_EXTERN(CFGOPT_MANIFEST_SAVE_THRESHOLD_STR, CFGOPT_MANIF STRING_EXTERN(CFGOPT_NEUTRAL_UMASK_STR, CFGOPT_NEUTRAL_UMASK); STRING_EXTERN(CFGOPT_ONLINE_STR, CFGOPT_ONLINE); STRING_EXTERN(CFGOPT_OUTPUT_STR, CFGOPT_OUTPUT); -STRING_EXTERN(CFGOPT_PG1_HOST_STR, CFGOPT_PG1_HOST); -STRING_EXTERN(CFGOPT_PG2_HOST_STR, CFGOPT_PG2_HOST); -STRING_EXTERN(CFGOPT_PG3_HOST_STR, CFGOPT_PG3_HOST); -STRING_EXTERN(CFGOPT_PG4_HOST_STR, CFGOPT_PG4_HOST); -STRING_EXTERN(CFGOPT_PG5_HOST_STR, CFGOPT_PG5_HOST); -STRING_EXTERN(CFGOPT_PG6_HOST_STR, CFGOPT_PG6_HOST); -STRING_EXTERN(CFGOPT_PG7_HOST_STR, CFGOPT_PG7_HOST); -STRING_EXTERN(CFGOPT_PG8_HOST_STR, CFGOPT_PG8_HOST); -STRING_EXTERN(CFGOPT_PG1_HOST_CMD_STR, CFGOPT_PG1_HOST_CMD); -STRING_EXTERN(CFGOPT_PG2_HOST_CMD_STR, CFGOPT_PG2_HOST_CMD); -STRING_EXTERN(CFGOPT_PG3_HOST_CMD_STR, CFGOPT_PG3_HOST_CMD); -STRING_EXTERN(CFGOPT_PG4_HOST_CMD_STR, CFGOPT_PG4_HOST_CMD); -STRING_EXTERN(CFGOPT_PG5_HOST_CMD_STR, CFGOPT_PG5_HOST_CMD); -STRING_EXTERN(CFGOPT_PG6_HOST_CMD_STR, CFGOPT_PG6_HOST_CMD); -STRING_EXTERN(CFGOPT_PG7_HOST_CMD_STR, CFGOPT_PG7_HOST_CMD); -STRING_EXTERN(CFGOPT_PG8_HOST_CMD_STR, CFGOPT_PG8_HOST_CMD); -STRING_EXTERN(CFGOPT_PG1_HOST_CONFIG_STR, CFGOPT_PG1_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG2_HOST_CONFIG_STR, CFGOPT_PG2_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG3_HOST_CONFIG_STR, CFGOPT_PG3_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG4_HOST_CONFIG_STR, CFGOPT_PG4_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG5_HOST_CONFIG_STR, CFGOPT_PG5_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG6_HOST_CONFIG_STR, CFGOPT_PG6_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG7_HOST_CONFIG_STR, CFGOPT_PG7_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG8_HOST_CONFIG_STR, CFGOPT_PG8_HOST_CONFIG); -STRING_EXTERN(CFGOPT_PG1_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG1_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG2_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG2_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG3_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG3_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG4_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG4_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG5_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG5_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG6_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG6_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG7_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG7_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG8_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_PG8_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_PG1_HOST_CONFIG_PATH_STR, CFGOPT_PG1_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG2_HOST_CONFIG_PATH_STR, CFGOPT_PG2_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG3_HOST_CONFIG_PATH_STR, CFGOPT_PG3_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG4_HOST_CONFIG_PATH_STR, CFGOPT_PG4_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG5_HOST_CONFIG_PATH_STR, CFGOPT_PG5_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG6_HOST_CONFIG_PATH_STR, CFGOPT_PG6_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG7_HOST_CONFIG_PATH_STR, CFGOPT_PG7_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG8_HOST_CONFIG_PATH_STR, CFGOPT_PG8_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_PG1_HOST_PORT_STR, CFGOPT_PG1_HOST_PORT); -STRING_EXTERN(CFGOPT_PG2_HOST_PORT_STR, CFGOPT_PG2_HOST_PORT); -STRING_EXTERN(CFGOPT_PG3_HOST_PORT_STR, CFGOPT_PG3_HOST_PORT); -STRING_EXTERN(CFGOPT_PG4_HOST_PORT_STR, CFGOPT_PG4_HOST_PORT); -STRING_EXTERN(CFGOPT_PG5_HOST_PORT_STR, CFGOPT_PG5_HOST_PORT); -STRING_EXTERN(CFGOPT_PG6_HOST_PORT_STR, CFGOPT_PG6_HOST_PORT); -STRING_EXTERN(CFGOPT_PG7_HOST_PORT_STR, CFGOPT_PG7_HOST_PORT); -STRING_EXTERN(CFGOPT_PG8_HOST_PORT_STR, CFGOPT_PG8_HOST_PORT); -STRING_EXTERN(CFGOPT_PG1_HOST_USER_STR, CFGOPT_PG1_HOST_USER); -STRING_EXTERN(CFGOPT_PG2_HOST_USER_STR, CFGOPT_PG2_HOST_USER); -STRING_EXTERN(CFGOPT_PG3_HOST_USER_STR, CFGOPT_PG3_HOST_USER); -STRING_EXTERN(CFGOPT_PG4_HOST_USER_STR, CFGOPT_PG4_HOST_USER); -STRING_EXTERN(CFGOPT_PG5_HOST_USER_STR, CFGOPT_PG5_HOST_USER); -STRING_EXTERN(CFGOPT_PG6_HOST_USER_STR, CFGOPT_PG6_HOST_USER); -STRING_EXTERN(CFGOPT_PG7_HOST_USER_STR, CFGOPT_PG7_HOST_USER); -STRING_EXTERN(CFGOPT_PG8_HOST_USER_STR, CFGOPT_PG8_HOST_USER); -STRING_EXTERN(CFGOPT_PG1_LOCAL_STR, CFGOPT_PG1_LOCAL); -STRING_EXTERN(CFGOPT_PG2_LOCAL_STR, CFGOPT_PG2_LOCAL); -STRING_EXTERN(CFGOPT_PG3_LOCAL_STR, CFGOPT_PG3_LOCAL); -STRING_EXTERN(CFGOPT_PG4_LOCAL_STR, CFGOPT_PG4_LOCAL); -STRING_EXTERN(CFGOPT_PG5_LOCAL_STR, CFGOPT_PG5_LOCAL); -STRING_EXTERN(CFGOPT_PG6_LOCAL_STR, CFGOPT_PG6_LOCAL); -STRING_EXTERN(CFGOPT_PG7_LOCAL_STR, CFGOPT_PG7_LOCAL); -STRING_EXTERN(CFGOPT_PG8_LOCAL_STR, CFGOPT_PG8_LOCAL); -STRING_EXTERN(CFGOPT_PG1_PATH_STR, CFGOPT_PG1_PATH); -STRING_EXTERN(CFGOPT_PG2_PATH_STR, CFGOPT_PG2_PATH); -STRING_EXTERN(CFGOPT_PG3_PATH_STR, CFGOPT_PG3_PATH); -STRING_EXTERN(CFGOPT_PG4_PATH_STR, CFGOPT_PG4_PATH); -STRING_EXTERN(CFGOPT_PG5_PATH_STR, CFGOPT_PG5_PATH); -STRING_EXTERN(CFGOPT_PG6_PATH_STR, CFGOPT_PG6_PATH); -STRING_EXTERN(CFGOPT_PG7_PATH_STR, CFGOPT_PG7_PATH); -STRING_EXTERN(CFGOPT_PG8_PATH_STR, CFGOPT_PG8_PATH); -STRING_EXTERN(CFGOPT_PG1_PORT_STR, CFGOPT_PG1_PORT); -STRING_EXTERN(CFGOPT_PG2_PORT_STR, CFGOPT_PG2_PORT); -STRING_EXTERN(CFGOPT_PG3_PORT_STR, CFGOPT_PG3_PORT); -STRING_EXTERN(CFGOPT_PG4_PORT_STR, CFGOPT_PG4_PORT); -STRING_EXTERN(CFGOPT_PG5_PORT_STR, CFGOPT_PG5_PORT); -STRING_EXTERN(CFGOPT_PG6_PORT_STR, CFGOPT_PG6_PORT); -STRING_EXTERN(CFGOPT_PG7_PORT_STR, CFGOPT_PG7_PORT); -STRING_EXTERN(CFGOPT_PG8_PORT_STR, CFGOPT_PG8_PORT); -STRING_EXTERN(CFGOPT_PG1_SOCKET_PATH_STR, CFGOPT_PG1_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG2_SOCKET_PATH_STR, CFGOPT_PG2_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG3_SOCKET_PATH_STR, CFGOPT_PG3_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG4_SOCKET_PATH_STR, CFGOPT_PG4_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG5_SOCKET_PATH_STR, CFGOPT_PG5_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG6_SOCKET_PATH_STR, CFGOPT_PG6_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG7_SOCKET_PATH_STR, CFGOPT_PG7_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG8_SOCKET_PATH_STR, CFGOPT_PG8_SOCKET_PATH); -STRING_EXTERN(CFGOPT_PG1_USER_STR, CFGOPT_PG1_USER); -STRING_EXTERN(CFGOPT_PG2_USER_STR, CFGOPT_PG2_USER); -STRING_EXTERN(CFGOPT_PG3_USER_STR, CFGOPT_PG3_USER); -STRING_EXTERN(CFGOPT_PG4_USER_STR, CFGOPT_PG4_USER); -STRING_EXTERN(CFGOPT_PG5_USER_STR, CFGOPT_PG5_USER); -STRING_EXTERN(CFGOPT_PG6_USER_STR, CFGOPT_PG6_USER); -STRING_EXTERN(CFGOPT_PG7_USER_STR, CFGOPT_PG7_USER); -STRING_EXTERN(CFGOPT_PG8_USER_STR, CFGOPT_PG8_USER); STRING_EXTERN(CFGOPT_PROCESS_STR, CFGOPT_PROCESS); STRING_EXTERN(CFGOPT_PROCESS_MAX_STR, CFGOPT_PROCESS_MAX); STRING_EXTERN(CFGOPT_PROTOCOL_TIMEOUT_STR, CFGOPT_PROTOCOL_TIMEOUT); @@ -443,48 +347,6 @@ STRING_EXTERN(CFGOPT_RAW_STR, CFGOPT_RAW); STRING_EXTERN(CFGOPT_RECOVERY_OPTION_STR, CFGOPT_RECOVERY_OPTION); STRING_EXTERN(CFGOPT_RECURSE_STR, CFGOPT_RECURSE); STRING_EXTERN(CFGOPT_REMOTE_TYPE_STR, CFGOPT_REMOTE_TYPE); -STRING_EXTERN(CFGOPT_REPO1_AZURE_ACCOUNT_STR, CFGOPT_REPO1_AZURE_ACCOUNT); -STRING_EXTERN(CFGOPT_REPO1_AZURE_CA_FILE_STR, CFGOPT_REPO1_AZURE_CA_FILE); -STRING_EXTERN(CFGOPT_REPO1_AZURE_CA_PATH_STR, CFGOPT_REPO1_AZURE_CA_PATH); -STRING_EXTERN(CFGOPT_REPO1_AZURE_CONTAINER_STR, CFGOPT_REPO1_AZURE_CONTAINER); -STRING_EXTERN(CFGOPT_REPO1_AZURE_ENDPOINT_STR, CFGOPT_REPO1_AZURE_ENDPOINT); -STRING_EXTERN(CFGOPT_REPO1_AZURE_HOST_STR, CFGOPT_REPO1_AZURE_HOST); -STRING_EXTERN(CFGOPT_REPO1_AZURE_KEY_STR, CFGOPT_REPO1_AZURE_KEY); -STRING_EXTERN(CFGOPT_REPO1_AZURE_KEY_TYPE_STR, CFGOPT_REPO1_AZURE_KEY_TYPE); -STRING_EXTERN(CFGOPT_REPO1_AZURE_PORT_STR, CFGOPT_REPO1_AZURE_PORT); -STRING_EXTERN(CFGOPT_REPO1_AZURE_VERIFY_TLS_STR, CFGOPT_REPO1_AZURE_VERIFY_TLS); -STRING_EXTERN(CFGOPT_REPO1_CIPHER_PASS_STR, CFGOPT_REPO1_CIPHER_PASS); -STRING_EXTERN(CFGOPT_REPO1_CIPHER_TYPE_STR, CFGOPT_REPO1_CIPHER_TYPE); -STRING_EXTERN(CFGOPT_REPO1_HARDLINK_STR, CFGOPT_REPO1_HARDLINK); -STRING_EXTERN(CFGOPT_REPO1_HOST_STR, CFGOPT_REPO1_HOST); -STRING_EXTERN(CFGOPT_REPO1_HOST_CMD_STR, CFGOPT_REPO1_HOST_CMD); -STRING_EXTERN(CFGOPT_REPO1_HOST_CONFIG_STR, CFGOPT_REPO1_HOST_CONFIG); -STRING_EXTERN(CFGOPT_REPO1_HOST_CONFIG_INCLUDE_PATH_STR, CFGOPT_REPO1_HOST_CONFIG_INCLUDE_PATH); -STRING_EXTERN(CFGOPT_REPO1_HOST_CONFIG_PATH_STR, CFGOPT_REPO1_HOST_CONFIG_PATH); -STRING_EXTERN(CFGOPT_REPO1_HOST_PORT_STR, CFGOPT_REPO1_HOST_PORT); -STRING_EXTERN(CFGOPT_REPO1_HOST_USER_STR, CFGOPT_REPO1_HOST_USER); -STRING_EXTERN(CFGOPT_REPO1_LOCAL_STR, CFGOPT_REPO1_LOCAL); -STRING_EXTERN(CFGOPT_REPO1_PATH_STR, CFGOPT_REPO1_PATH); -STRING_EXTERN(CFGOPT_REPO1_RETENTION_ARCHIVE_STR, CFGOPT_REPO1_RETENTION_ARCHIVE); -STRING_EXTERN(CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE_STR, CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE); -STRING_EXTERN(CFGOPT_REPO1_RETENTION_DIFF_STR, CFGOPT_REPO1_RETENTION_DIFF); -STRING_EXTERN(CFGOPT_REPO1_RETENTION_FULL_STR, CFGOPT_REPO1_RETENTION_FULL); -STRING_EXTERN(CFGOPT_REPO1_RETENTION_FULL_TYPE_STR, CFGOPT_REPO1_RETENTION_FULL_TYPE); -STRING_EXTERN(CFGOPT_REPO1_S3_BUCKET_STR, CFGOPT_REPO1_S3_BUCKET); -STRING_EXTERN(CFGOPT_REPO1_S3_CA_FILE_STR, CFGOPT_REPO1_S3_CA_FILE); -STRING_EXTERN(CFGOPT_REPO1_S3_CA_PATH_STR, CFGOPT_REPO1_S3_CA_PATH); -STRING_EXTERN(CFGOPT_REPO1_S3_ENDPOINT_STR, CFGOPT_REPO1_S3_ENDPOINT); -STRING_EXTERN(CFGOPT_REPO1_S3_HOST_STR, CFGOPT_REPO1_S3_HOST); -STRING_EXTERN(CFGOPT_REPO1_S3_KEY_STR, CFGOPT_REPO1_S3_KEY); -STRING_EXTERN(CFGOPT_REPO1_S3_KEY_SECRET_STR, CFGOPT_REPO1_S3_KEY_SECRET); -STRING_EXTERN(CFGOPT_REPO1_S3_KEY_TYPE_STR, CFGOPT_REPO1_S3_KEY_TYPE); -STRING_EXTERN(CFGOPT_REPO1_S3_PORT_STR, CFGOPT_REPO1_S3_PORT); -STRING_EXTERN(CFGOPT_REPO1_S3_REGION_STR, CFGOPT_REPO1_S3_REGION); -STRING_EXTERN(CFGOPT_REPO1_S3_ROLE_STR, CFGOPT_REPO1_S3_ROLE); -STRING_EXTERN(CFGOPT_REPO1_S3_TOKEN_STR, CFGOPT_REPO1_S3_TOKEN); -STRING_EXTERN(CFGOPT_REPO1_S3_URI_STYLE_STR, CFGOPT_REPO1_S3_URI_STYLE); -STRING_EXTERN(CFGOPT_REPO1_S3_VERIFY_TLS_STR, CFGOPT_REPO1_S3_VERIFY_TLS); -STRING_EXTERN(CFGOPT_REPO1_TYPE_STR, CFGOPT_REPO1_TYPE); STRING_EXTERN(CFGOPT_RESUME_STR, CFGOPT_RESUME); STRING_EXTERN(CFGOPT_SCK_BLOCK_STR, CFGOPT_SCK_BLOCK); STRING_EXTERN(CFGOPT_SCK_KEEP_ALIVE_STR, CFGOPT_SCK_KEEP_ALIVE); @@ -513,7 +375,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ARCHIVE_ASYNC) + CONFIG_OPTION_NAME("archive-async") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveAsync) CONFIG_OPTION_GROUP(false) @@ -522,7 +384,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ARCHIVE_CHECK) + CONFIG_OPTION_NAME("archive-check") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveCheck) CONFIG_OPTION_GROUP(false) @@ -531,7 +393,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ARCHIVE_COPY) + CONFIG_OPTION_NAME("archive-copy") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveCopy) CONFIG_OPTION_GROUP(false) @@ -540,7 +402,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ARCHIVE_GET_QUEUE_MAX) + CONFIG_OPTION_NAME("archive-get-queue-max") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveGetQueueMax) CONFIG_OPTION_GROUP(false) @@ -549,7 +411,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ARCHIVE_MODE) + CONFIG_OPTION_NAME("archive-mode") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveMode) CONFIG_OPTION_GROUP(false) @@ -558,7 +420,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ARCHIVE_PUSH_QUEUE_MAX) + CONFIG_OPTION_NAME("archive-push-queue-max") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptArchivePushQueueMax) CONFIG_OPTION_GROUP(false) @@ -567,7 +429,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ARCHIVE_TIMEOUT) + CONFIG_OPTION_NAME("archive-timeout") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveTimeout) CONFIG_OPTION_GROUP(false) @@ -576,7 +438,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_BACKUP_STANDBY) + CONFIG_OPTION_NAME("backup-standby") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptBackupStandby) CONFIG_OPTION_GROUP(false) @@ -585,7 +447,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_BUFFER_SIZE) + CONFIG_OPTION_NAME("buffer-size") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptBufferSize) CONFIG_OPTION_GROUP(false) @@ -594,7 +456,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_CHECKSUM_PAGE) + CONFIG_OPTION_NAME("checksum-page") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptChecksumPage) CONFIG_OPTION_GROUP(false) @@ -603,7 +465,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_CIPHER_PASS) + CONFIG_OPTION_NAME("cipher-pass") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptCipherPass) CONFIG_OPTION_GROUP(false) @@ -612,7 +474,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_CMD_SSH) + CONFIG_OPTION_NAME("cmd-ssh") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptCmdSsh) CONFIG_OPTION_GROUP(false) @@ -621,7 +483,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_COMPRESS) + CONFIG_OPTION_NAME("compress") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptCompress) CONFIG_OPTION_GROUP(false) @@ -630,7 +492,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_COMPRESS_LEVEL) + CONFIG_OPTION_NAME("compress-level") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptCompressLevel) CONFIG_OPTION_GROUP(false) @@ -639,7 +501,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_COMPRESS_LEVEL_NETWORK) + CONFIG_OPTION_NAME("compress-level-network") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptCompressLevelNetwork) CONFIG_OPTION_GROUP(false) @@ -648,7 +510,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_COMPRESS_TYPE) + CONFIG_OPTION_NAME("compress-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptCompressType) CONFIG_OPTION_GROUP(false) @@ -657,7 +519,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_CONFIG) + CONFIG_OPTION_NAME("config") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptConfig) CONFIG_OPTION_GROUP(false) @@ -666,7 +528,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("config-include-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptConfigIncludePath) CONFIG_OPTION_GROUP(false) @@ -675,7 +537,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_CONFIG_PATH) + CONFIG_OPTION_NAME("config-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptConfigPath) CONFIG_OPTION_GROUP(false) @@ -684,7 +546,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_DB_INCLUDE) + CONFIG_OPTION_NAME("db-include") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptDbInclude) CONFIG_OPTION_GROUP(false) @@ -693,7 +555,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_DB_TIMEOUT) + CONFIG_OPTION_NAME("db-timeout") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptDbTimeout) CONFIG_OPTION_GROUP(false) @@ -702,7 +564,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_DELTA) + CONFIG_OPTION_NAME("delta") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptDelta) CONFIG_OPTION_GROUP(false) @@ -711,7 +573,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_DRY_RUN) + CONFIG_OPTION_NAME("dry-run") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptDryRun) CONFIG_OPTION_GROUP(false) @@ -720,7 +582,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_EXCLUDE) + CONFIG_OPTION_NAME("exclude") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptExclude) CONFIG_OPTION_GROUP(false) @@ -729,7 +591,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_EXPIRE_AUTO) + CONFIG_OPTION_NAME("expire-auto") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptExpireAuto) CONFIG_OPTION_GROUP(false) @@ -738,7 +600,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_FILTER) + CONFIG_OPTION_NAME("filter") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptFilter) CONFIG_OPTION_GROUP(false) @@ -747,7 +609,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_FORCE) + CONFIG_OPTION_NAME("force") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptForce) CONFIG_OPTION_GROUP(false) @@ -756,7 +618,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_HOST_ID) + CONFIG_OPTION_NAME("host-id") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptHostId) CONFIG_OPTION_GROUP(false) @@ -765,7 +627,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_IGNORE_MISSING) + CONFIG_OPTION_NAME("ignore-missing") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptIgnoreMissing) CONFIG_OPTION_GROUP(false) @@ -774,7 +636,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_IO_TIMEOUT) + CONFIG_OPTION_NAME("io-timeout") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptIoTimeout) CONFIG_OPTION_GROUP(false) @@ -783,7 +645,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LINK_ALL) + CONFIG_OPTION_NAME("link-all") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLinkAll) CONFIG_OPTION_GROUP(false) @@ -792,7 +654,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LINK_MAP) + CONFIG_OPTION_NAME("link-map") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLinkMap) CONFIG_OPTION_GROUP(false) @@ -801,7 +663,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LOCK_PATH) + CONFIG_OPTION_NAME("lock-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLockPath) CONFIG_OPTION_GROUP(false) @@ -810,7 +672,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LOG_LEVEL_CONSOLE) + CONFIG_OPTION_NAME("log-level-console") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLogLevelConsole) CONFIG_OPTION_GROUP(false) @@ -819,7 +681,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LOG_LEVEL_FILE) + CONFIG_OPTION_NAME("log-level-file") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLogLevelFile) CONFIG_OPTION_GROUP(false) @@ -828,7 +690,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LOG_LEVEL_STDERR) + CONFIG_OPTION_NAME("log-level-stderr") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLogLevelStderr) CONFIG_OPTION_GROUP(false) @@ -837,7 +699,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LOG_PATH) + CONFIG_OPTION_NAME("log-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLogPath) CONFIG_OPTION_GROUP(false) @@ -846,7 +708,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LOG_SUBPROCESS) + CONFIG_OPTION_NAME("log-subprocess") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLogSubprocess) CONFIG_OPTION_GROUP(false) @@ -855,7 +717,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_LOG_TIMESTAMP) + CONFIG_OPTION_NAME("log-timestamp") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptLogTimestamp) CONFIG_OPTION_GROUP(false) @@ -864,7 +726,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_MANIFEST_SAVE_THRESHOLD) + CONFIG_OPTION_NAME("manifest-save-threshold") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptManifestSaveThreshold) CONFIG_OPTION_GROUP(false) @@ -873,7 +735,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_NEUTRAL_UMASK) + CONFIG_OPTION_NAME("neutral-umask") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptNeutralUmask) CONFIG_OPTION_GROUP(false) @@ -882,7 +744,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_ONLINE) + CONFIG_OPTION_NAME("online") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptOnline) CONFIG_OPTION_GROUP(false) @@ -891,7 +753,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_OUTPUT) + CONFIG_OPTION_NAME("output") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptOutput) CONFIG_OPTION_GROUP(false) @@ -900,7 +762,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_HOST) + CONFIG_OPTION_NAME("pg1-host") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -910,7 +772,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_HOST) + CONFIG_OPTION_NAME("pg2-host") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -920,7 +782,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_HOST) + CONFIG_OPTION_NAME("pg3-host") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -930,7 +792,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_HOST) + CONFIG_OPTION_NAME("pg4-host") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -940,7 +802,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_HOST) + CONFIG_OPTION_NAME("pg5-host") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -950,7 +812,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_HOST) + CONFIG_OPTION_NAME("pg6-host") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -960,7 +822,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_HOST) + CONFIG_OPTION_NAME("pg7-host") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -970,7 +832,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_HOST) + CONFIG_OPTION_NAME("pg8-host") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) CONFIG_OPTION_GROUP(true) @@ -980,7 +842,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_HOST_CMD) + CONFIG_OPTION_NAME("pg1-host-cmd") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -990,7 +852,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_HOST_CMD) + CONFIG_OPTION_NAME("pg2-host-cmd") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -1000,7 +862,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_HOST_CMD) + CONFIG_OPTION_NAME("pg3-host-cmd") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -1010,7 +872,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_HOST_CMD) + CONFIG_OPTION_NAME("pg4-host-cmd") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -1020,7 +882,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_HOST_CMD) + CONFIG_OPTION_NAME("pg5-host-cmd") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -1030,7 +892,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_HOST_CMD) + CONFIG_OPTION_NAME("pg6-host-cmd") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -1040,7 +902,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_HOST_CMD) + CONFIG_OPTION_NAME("pg7-host-cmd") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -1050,7 +912,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_HOST_CMD) + CONFIG_OPTION_NAME("pg8-host-cmd") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) CONFIG_OPTION_GROUP(true) @@ -1060,7 +922,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_HOST_CONFIG) + CONFIG_OPTION_NAME("pg1-host-config") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1070,7 +932,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_HOST_CONFIG) + CONFIG_OPTION_NAME("pg2-host-config") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1080,7 +942,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_HOST_CONFIG) + CONFIG_OPTION_NAME("pg3-host-config") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1090,7 +952,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_HOST_CONFIG) + CONFIG_OPTION_NAME("pg4-host-config") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1100,7 +962,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_HOST_CONFIG) + CONFIG_OPTION_NAME("pg5-host-config") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1110,7 +972,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_HOST_CONFIG) + CONFIG_OPTION_NAME("pg6-host-config") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1120,7 +982,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_HOST_CONFIG) + CONFIG_OPTION_NAME("pg7-host-config") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1130,7 +992,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_HOST_CONFIG) + CONFIG_OPTION_NAME("pg8-host-config") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) CONFIG_OPTION_GROUP(true) @@ -1140,7 +1002,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg1-host-config-include-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1150,7 +1012,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg2-host-config-include-path") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1160,7 +1022,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg3-host-config-include-path") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1170,7 +1032,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg4-host-config-include-path") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1180,7 +1042,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg5-host-config-include-path") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1190,7 +1052,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg6-host-config-include-path") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1200,7 +1062,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg7-host-config-include-path") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1210,7 +1072,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("pg8-host-config-include-path") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -1220,7 +1082,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg1-host-config-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1230,7 +1092,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg2-host-config-path") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1240,7 +1102,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg3-host-config-path") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1250,7 +1112,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg4-host-config-path") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1260,7 +1122,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg5-host-config-path") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1270,7 +1132,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg6-host-config-path") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1280,7 +1142,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg7-host-config-path") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1290,7 +1152,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("pg8-host-config-path") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -1300,7 +1162,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_HOST_PORT) + CONFIG_OPTION_NAME("pg1-host-port") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1310,7 +1172,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_HOST_PORT) + CONFIG_OPTION_NAME("pg2-host-port") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1320,7 +1182,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_HOST_PORT) + CONFIG_OPTION_NAME("pg3-host-port") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1330,7 +1192,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_HOST_PORT) + CONFIG_OPTION_NAME("pg4-host-port") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1340,7 +1202,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_HOST_PORT) + CONFIG_OPTION_NAME("pg5-host-port") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1350,7 +1212,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_HOST_PORT) + CONFIG_OPTION_NAME("pg6-host-port") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1360,7 +1222,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_HOST_PORT) + CONFIG_OPTION_NAME("pg7-host-port") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1370,7 +1232,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_HOST_PORT) + CONFIG_OPTION_NAME("pg8-host-port") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) CONFIG_OPTION_GROUP(true) @@ -1380,7 +1242,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_HOST_USER) + CONFIG_OPTION_NAME("pg1-host-user") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1390,7 +1252,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_HOST_USER) + CONFIG_OPTION_NAME("pg2-host-user") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1400,7 +1262,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_HOST_USER) + CONFIG_OPTION_NAME("pg3-host-user") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1410,7 +1272,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_HOST_USER) + CONFIG_OPTION_NAME("pg4-host-user") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1420,7 +1282,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_HOST_USER) + CONFIG_OPTION_NAME("pg5-host-user") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1430,7 +1292,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_HOST_USER) + CONFIG_OPTION_NAME("pg6-host-user") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1440,7 +1302,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_HOST_USER) + CONFIG_OPTION_NAME("pg7-host-user") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1450,7 +1312,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_HOST_USER) + CONFIG_OPTION_NAME("pg8-host-user") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) CONFIG_OPTION_GROUP(true) @@ -1460,7 +1322,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_LOCAL) + CONFIG_OPTION_NAME("pg1-local") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1470,7 +1332,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_LOCAL) + CONFIG_OPTION_NAME("pg2-local") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1480,7 +1342,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_LOCAL) + CONFIG_OPTION_NAME("pg3-local") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1490,7 +1352,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_LOCAL) + CONFIG_OPTION_NAME("pg4-local") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1500,7 +1362,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_LOCAL) + CONFIG_OPTION_NAME("pg5-local") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1510,7 +1372,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_LOCAL) + CONFIG_OPTION_NAME("pg6-local") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1520,7 +1382,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_LOCAL) + CONFIG_OPTION_NAME("pg7-local") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1530,7 +1392,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_LOCAL) + CONFIG_OPTION_NAME("pg8-local") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgLocal) CONFIG_OPTION_GROUP(true) @@ -1540,7 +1402,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_PATH) + CONFIG_OPTION_NAME("pg1-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1550,7 +1412,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_PATH) + CONFIG_OPTION_NAME("pg2-path") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1560,7 +1422,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_PATH) + CONFIG_OPTION_NAME("pg3-path") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1570,7 +1432,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_PATH) + CONFIG_OPTION_NAME("pg4-path") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1580,7 +1442,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_PATH) + CONFIG_OPTION_NAME("pg5-path") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1590,7 +1452,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_PATH) + CONFIG_OPTION_NAME("pg6-path") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1600,7 +1462,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_PATH) + CONFIG_OPTION_NAME("pg7-path") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1610,7 +1472,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_PATH) + CONFIG_OPTION_NAME("pg8-path") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) CONFIG_OPTION_GROUP(true) @@ -1620,7 +1482,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_PORT) + CONFIG_OPTION_NAME("pg1-port") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1630,7 +1492,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_PORT) + CONFIG_OPTION_NAME("pg2-port") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1640,7 +1502,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_PORT) + CONFIG_OPTION_NAME("pg3-port") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1650,7 +1512,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_PORT) + CONFIG_OPTION_NAME("pg4-port") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1660,7 +1522,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_PORT) + CONFIG_OPTION_NAME("pg5-port") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1670,7 +1532,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_PORT) + CONFIG_OPTION_NAME("pg6-port") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1680,7 +1542,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_PORT) + CONFIG_OPTION_NAME("pg7-port") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1690,7 +1552,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_PORT) + CONFIG_OPTION_NAME("pg8-port") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) CONFIG_OPTION_GROUP(true) @@ -1700,7 +1562,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_SOCKET_PATH) + CONFIG_OPTION_NAME("pg1-socket-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1710,7 +1572,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_SOCKET_PATH) + CONFIG_OPTION_NAME("pg2-socket-path") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1720,7 +1582,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_SOCKET_PATH) + CONFIG_OPTION_NAME("pg3-socket-path") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1730,7 +1592,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_SOCKET_PATH) + CONFIG_OPTION_NAME("pg4-socket-path") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1740,7 +1602,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_SOCKET_PATH) + CONFIG_OPTION_NAME("pg5-socket-path") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1750,7 +1612,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_SOCKET_PATH) + CONFIG_OPTION_NAME("pg6-socket-path") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1760,7 +1622,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_SOCKET_PATH) + CONFIG_OPTION_NAME("pg7-socket-path") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1770,7 +1632,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_SOCKET_PATH) + CONFIG_OPTION_NAME("pg8-socket-path") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) CONFIG_OPTION_GROUP(true) @@ -1780,7 +1642,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG1_USER) + CONFIG_OPTION_NAME("pg1-user") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1790,7 +1652,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG2_USER) + CONFIG_OPTION_NAME("pg2-user") CONFIG_OPTION_INDEX(1) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1800,7 +1662,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG3_USER) + CONFIG_OPTION_NAME("pg3-user") CONFIG_OPTION_INDEX(2) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1810,7 +1672,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG4_USER) + CONFIG_OPTION_NAME("pg4-user") CONFIG_OPTION_INDEX(3) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1820,7 +1682,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG5_USER) + CONFIG_OPTION_NAME("pg5-user") CONFIG_OPTION_INDEX(4) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1830,7 +1692,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG6_USER) + CONFIG_OPTION_NAME("pg6-user") CONFIG_OPTION_INDEX(5) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1840,7 +1702,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG7_USER) + CONFIG_OPTION_NAME("pg7-user") CONFIG_OPTION_INDEX(6) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1850,7 +1712,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PG8_USER) + CONFIG_OPTION_NAME("pg8-user") CONFIG_OPTION_INDEX(7) CONFIG_OPTION_DEFINE_ID(cfgDefOptPgUser) CONFIG_OPTION_GROUP(true) @@ -1860,7 +1722,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PROCESS) + CONFIG_OPTION_NAME("process") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptProcess) CONFIG_OPTION_GROUP(false) @@ -1869,7 +1731,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PROCESS_MAX) + CONFIG_OPTION_NAME("process-max") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptProcessMax) CONFIG_OPTION_GROUP(false) @@ -1878,7 +1740,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_PROTOCOL_TIMEOUT) + CONFIG_OPTION_NAME("protocol-timeout") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptProtocolTimeout) CONFIG_OPTION_GROUP(false) @@ -1887,7 +1749,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_RAW) + CONFIG_OPTION_NAME("raw") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRaw) CONFIG_OPTION_GROUP(false) @@ -1896,7 +1758,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_RECOVERY_OPTION) + CONFIG_OPTION_NAME("recovery-option") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRecoveryOption) CONFIG_OPTION_GROUP(false) @@ -1905,7 +1767,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_RECURSE) + CONFIG_OPTION_NAME("recurse") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRecurse) CONFIG_OPTION_GROUP(false) @@ -1914,7 +1776,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REMOTE_TYPE) + CONFIG_OPTION_NAME("remote-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRemoteType) CONFIG_OPTION_GROUP(false) @@ -1923,7 +1785,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_ACCOUNT) + CONFIG_OPTION_NAME("repo1-azure-account") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureAccount) CONFIG_OPTION_GROUP(true) @@ -1933,7 +1795,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_CA_FILE) + CONFIG_OPTION_NAME("repo1-azure-ca-file") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureCaFile) CONFIG_OPTION_GROUP(true) @@ -1943,7 +1805,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_CA_PATH) + CONFIG_OPTION_NAME("repo1-azure-ca-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureCaPath) CONFIG_OPTION_GROUP(true) @@ -1953,7 +1815,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_CONTAINER) + CONFIG_OPTION_NAME("repo1-azure-container") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureContainer) CONFIG_OPTION_GROUP(true) @@ -1963,7 +1825,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_ENDPOINT) + CONFIG_OPTION_NAME("repo1-azure-endpoint") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureEndpoint) CONFIG_OPTION_GROUP(true) @@ -1973,7 +1835,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_HOST) + CONFIG_OPTION_NAME("repo1-azure-host") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureHost) CONFIG_OPTION_GROUP(true) @@ -1983,7 +1845,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_KEY) + CONFIG_OPTION_NAME("repo1-azure-key") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureKey) CONFIG_OPTION_GROUP(true) @@ -1993,7 +1855,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_KEY_TYPE) + CONFIG_OPTION_NAME("repo1-azure-key-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureKeyType) CONFIG_OPTION_GROUP(true) @@ -2003,7 +1865,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_PORT) + CONFIG_OPTION_NAME("repo1-azure-port") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzurePort) CONFIG_OPTION_GROUP(true) @@ -2013,7 +1875,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_AZURE_VERIFY_TLS) + CONFIG_OPTION_NAME("repo1-azure-verify-tls") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoAzureVerifyTls) CONFIG_OPTION_GROUP(true) @@ -2023,7 +1885,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_CIPHER_PASS) + CONFIG_OPTION_NAME("repo1-cipher-pass") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoCipherPass) CONFIG_OPTION_GROUP(true) @@ -2033,7 +1895,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_CIPHER_TYPE) + CONFIG_OPTION_NAME("repo1-cipher-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoCipherType) CONFIG_OPTION_GROUP(true) @@ -2043,7 +1905,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HARDLINK) + CONFIG_OPTION_NAME("repo1-hardlink") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHardlink) CONFIG_OPTION_GROUP(true) @@ -2053,7 +1915,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HOST) + CONFIG_OPTION_NAME("repo1-host") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHost) CONFIG_OPTION_GROUP(true) @@ -2063,7 +1925,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HOST_CMD) + CONFIG_OPTION_NAME("repo1-host-cmd") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostCmd) CONFIG_OPTION_GROUP(true) @@ -2073,7 +1935,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HOST_CONFIG) + CONFIG_OPTION_NAME("repo1-host-config") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostConfig) CONFIG_OPTION_GROUP(true) @@ -2083,7 +1945,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HOST_CONFIG_INCLUDE_PATH) + CONFIG_OPTION_NAME("repo1-host-config-include-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostConfigIncludePath) CONFIG_OPTION_GROUP(true) @@ -2093,7 +1955,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HOST_CONFIG_PATH) + CONFIG_OPTION_NAME("repo1-host-config-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostConfigPath) CONFIG_OPTION_GROUP(true) @@ -2103,7 +1965,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HOST_PORT) + CONFIG_OPTION_NAME("repo1-host-port") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostPort) CONFIG_OPTION_GROUP(true) @@ -2113,7 +1975,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_HOST_USER) + CONFIG_OPTION_NAME("repo1-host-user") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostUser) CONFIG_OPTION_GROUP(true) @@ -2123,7 +1985,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_LOCAL) + CONFIG_OPTION_NAME("repo1-local") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoLocal) CONFIG_OPTION_GROUP(true) @@ -2133,7 +1995,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_PATH) + CONFIG_OPTION_NAME("repo1-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoPath) CONFIG_OPTION_GROUP(true) @@ -2143,7 +2005,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_RETENTION_ARCHIVE) + CONFIG_OPTION_NAME("repo1-retention-archive") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoRetentionArchive) CONFIG_OPTION_GROUP(true) @@ -2153,7 +2015,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE) + CONFIG_OPTION_NAME("repo1-retention-archive-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoRetentionArchiveType) CONFIG_OPTION_GROUP(true) @@ -2163,7 +2025,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_RETENTION_DIFF) + CONFIG_OPTION_NAME("repo1-retention-diff") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoRetentionDiff) CONFIG_OPTION_GROUP(true) @@ -2173,7 +2035,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_RETENTION_FULL) + CONFIG_OPTION_NAME("repo1-retention-full") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoRetentionFull) CONFIG_OPTION_GROUP(true) @@ -2183,7 +2045,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_RETENTION_FULL_TYPE) + CONFIG_OPTION_NAME("repo1-retention-full-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoRetentionFullType) CONFIG_OPTION_GROUP(true) @@ -2193,7 +2055,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_BUCKET) + CONFIG_OPTION_NAME("repo1-s3-bucket") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Bucket) CONFIG_OPTION_GROUP(true) @@ -2203,7 +2065,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_CA_FILE) + CONFIG_OPTION_NAME("repo1-s3-ca-file") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3CaFile) CONFIG_OPTION_GROUP(true) @@ -2213,7 +2075,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_CA_PATH) + CONFIG_OPTION_NAME("repo1-s3-ca-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3CaPath) CONFIG_OPTION_GROUP(true) @@ -2223,7 +2085,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_ENDPOINT) + CONFIG_OPTION_NAME("repo1-s3-endpoint") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Endpoint) CONFIG_OPTION_GROUP(true) @@ -2233,7 +2095,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_HOST) + CONFIG_OPTION_NAME("repo1-s3-host") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Host) CONFIG_OPTION_GROUP(true) @@ -2243,7 +2105,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_KEY) + CONFIG_OPTION_NAME("repo1-s3-key") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Key) CONFIG_OPTION_GROUP(true) @@ -2253,7 +2115,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_KEY_SECRET) + CONFIG_OPTION_NAME("repo1-s3-key-secret") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3KeySecret) CONFIG_OPTION_GROUP(true) @@ -2263,7 +2125,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_KEY_TYPE) + CONFIG_OPTION_NAME("repo1-s3-key-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3KeyType) CONFIG_OPTION_GROUP(true) @@ -2273,7 +2135,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_PORT) + CONFIG_OPTION_NAME("repo1-s3-port") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Port) CONFIG_OPTION_GROUP(true) @@ -2283,7 +2145,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_REGION) + CONFIG_OPTION_NAME("repo1-s3-region") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Region) CONFIG_OPTION_GROUP(true) @@ -2293,7 +2155,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_ROLE) + CONFIG_OPTION_NAME("repo1-s3-role") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Role) CONFIG_OPTION_GROUP(true) @@ -2303,7 +2165,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_TOKEN) + CONFIG_OPTION_NAME("repo1-s3-token") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Token) CONFIG_OPTION_GROUP(true) @@ -2313,7 +2175,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_URI_STYLE) + CONFIG_OPTION_NAME("repo1-s3-uri-style") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3UriStyle) CONFIG_OPTION_GROUP(true) @@ -2323,7 +2185,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_S3_VERIFY_TLS) + CONFIG_OPTION_NAME("repo1-s3-verify-tls") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3VerifyTls) CONFIG_OPTION_GROUP(true) @@ -2333,7 +2195,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_REPO1_TYPE) + CONFIG_OPTION_NAME("repo1-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoType) CONFIG_OPTION_GROUP(true) @@ -2343,7 +2205,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_RESUME) + CONFIG_OPTION_NAME("resume") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptResume) CONFIG_OPTION_GROUP(false) @@ -2352,7 +2214,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_SCK_BLOCK) + CONFIG_OPTION_NAME("sck-block") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptSckBlock) CONFIG_OPTION_GROUP(false) @@ -2361,7 +2223,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_SCK_KEEP_ALIVE) + CONFIG_OPTION_NAME("sck-keep-alive") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptSckKeepAlive) CONFIG_OPTION_GROUP(false) @@ -2370,7 +2232,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_SET) + CONFIG_OPTION_NAME("set") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptSet) CONFIG_OPTION_GROUP(false) @@ -2379,7 +2241,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_SORT) + CONFIG_OPTION_NAME("sort") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptSort) CONFIG_OPTION_GROUP(false) @@ -2388,7 +2250,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_SPOOL_PATH) + CONFIG_OPTION_NAME("spool-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptSpoolPath) CONFIG_OPTION_GROUP(false) @@ -2397,7 +2259,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_STANZA) + CONFIG_OPTION_NAME("stanza") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptStanza) CONFIG_OPTION_GROUP(false) @@ -2406,7 +2268,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_START_FAST) + CONFIG_OPTION_NAME("start-fast") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptStartFast) CONFIG_OPTION_GROUP(false) @@ -2415,7 +2277,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_STOP_AUTO) + CONFIG_OPTION_NAME("stop-auto") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptStopAuto) CONFIG_OPTION_GROUP(false) @@ -2424,7 +2286,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TABLESPACE_MAP) + CONFIG_OPTION_NAME("tablespace-map") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTablespaceMap) CONFIG_OPTION_GROUP(false) @@ -2433,7 +2295,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TABLESPACE_MAP_ALL) + CONFIG_OPTION_NAME("tablespace-map-all") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTablespaceMapAll) CONFIG_OPTION_GROUP(false) @@ -2442,7 +2304,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TARGET) + CONFIG_OPTION_NAME("target") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTarget) CONFIG_OPTION_GROUP(false) @@ -2451,7 +2313,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TARGET_ACTION) + CONFIG_OPTION_NAME("target-action") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTargetAction) CONFIG_OPTION_GROUP(false) @@ -2460,7 +2322,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TARGET_EXCLUSIVE) + CONFIG_OPTION_NAME("target-exclusive") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTargetExclusive) CONFIG_OPTION_GROUP(false) @@ -2469,7 +2331,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TARGET_TIMELINE) + CONFIG_OPTION_NAME("target-timeline") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTargetTimeline) CONFIG_OPTION_GROUP(false) @@ -2478,7 +2340,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TCP_KEEP_ALIVE_COUNT) + CONFIG_OPTION_NAME("tcp-keep-alive-count") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTcpKeepAliveCount) CONFIG_OPTION_GROUP(false) @@ -2487,7 +2349,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TCP_KEEP_ALIVE_IDLE) + CONFIG_OPTION_NAME("tcp-keep-alive-idle") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTcpKeepAliveIdle) CONFIG_OPTION_GROUP(false) @@ -2496,7 +2358,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TCP_KEEP_ALIVE_INTERVAL) + CONFIG_OPTION_NAME("tcp-keep-alive-interval") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptTcpKeepAliveInterval) CONFIG_OPTION_GROUP(false) @@ -2505,7 +2367,7 @@ static ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME(CFGOPT_TYPE) + CONFIG_OPTION_NAME("type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptType) CONFIG_OPTION_GROUP(false) diff --git a/src/config/config.auto.h b/src/config/config.auto.h index 8864ab63b..0460c78b7 100644 --- a/src/config/config.auto.h +++ b/src/config/config.auto.h @@ -146,198 +146,6 @@ Option constants STRING_DECLARE(CFGOPT_ONLINE_STR); #define CFGOPT_OUTPUT "output" STRING_DECLARE(CFGOPT_OUTPUT_STR); -#define CFGOPT_PG1_HOST "pg1-host" - STRING_DECLARE(CFGOPT_PG1_HOST_STR); -#define CFGOPT_PG1_HOST_CMD "pg1-host-cmd" - STRING_DECLARE(CFGOPT_PG1_HOST_CMD_STR); -#define CFGOPT_PG1_HOST_CONFIG "pg1-host-config" - STRING_DECLARE(CFGOPT_PG1_HOST_CONFIG_STR); -#define CFGOPT_PG1_HOST_CONFIG_INCLUDE_PATH "pg1-host-config-include-path" - STRING_DECLARE(CFGOPT_PG1_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG1_HOST_CONFIG_PATH "pg1-host-config-path" - STRING_DECLARE(CFGOPT_PG1_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG1_HOST_PORT "pg1-host-port" - STRING_DECLARE(CFGOPT_PG1_HOST_PORT_STR); -#define CFGOPT_PG1_HOST_USER "pg1-host-user" - STRING_DECLARE(CFGOPT_PG1_HOST_USER_STR); -#define CFGOPT_PG1_LOCAL "pg1-local" - STRING_DECLARE(CFGOPT_PG1_LOCAL_STR); -#define CFGOPT_PG1_PATH "pg1-path" - STRING_DECLARE(CFGOPT_PG1_PATH_STR); -#define CFGOPT_PG1_PORT "pg1-port" - STRING_DECLARE(CFGOPT_PG1_PORT_STR); -#define CFGOPT_PG1_SOCKET_PATH "pg1-socket-path" - STRING_DECLARE(CFGOPT_PG1_SOCKET_PATH_STR); -#define CFGOPT_PG1_USER "pg1-user" - STRING_DECLARE(CFGOPT_PG1_USER_STR); -#define CFGOPT_PG2_HOST "pg2-host" - STRING_DECLARE(CFGOPT_PG2_HOST_STR); -#define CFGOPT_PG2_HOST_CMD "pg2-host-cmd" - STRING_DECLARE(CFGOPT_PG2_HOST_CMD_STR); -#define CFGOPT_PG2_HOST_CONFIG "pg2-host-config" - STRING_DECLARE(CFGOPT_PG2_HOST_CONFIG_STR); -#define CFGOPT_PG2_HOST_CONFIG_INCLUDE_PATH "pg2-host-config-include-path" - STRING_DECLARE(CFGOPT_PG2_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG2_HOST_CONFIG_PATH "pg2-host-config-path" - STRING_DECLARE(CFGOPT_PG2_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG2_HOST_PORT "pg2-host-port" - STRING_DECLARE(CFGOPT_PG2_HOST_PORT_STR); -#define CFGOPT_PG2_HOST_USER "pg2-host-user" - STRING_DECLARE(CFGOPT_PG2_HOST_USER_STR); -#define CFGOPT_PG2_LOCAL "pg2-local" - STRING_DECLARE(CFGOPT_PG2_LOCAL_STR); -#define CFGOPT_PG2_PATH "pg2-path" - STRING_DECLARE(CFGOPT_PG2_PATH_STR); -#define CFGOPT_PG2_PORT "pg2-port" - STRING_DECLARE(CFGOPT_PG2_PORT_STR); -#define CFGOPT_PG2_SOCKET_PATH "pg2-socket-path" - STRING_DECLARE(CFGOPT_PG2_SOCKET_PATH_STR); -#define CFGOPT_PG2_USER "pg2-user" - STRING_DECLARE(CFGOPT_PG2_USER_STR); -#define CFGOPT_PG3_HOST "pg3-host" - STRING_DECLARE(CFGOPT_PG3_HOST_STR); -#define CFGOPT_PG3_HOST_CMD "pg3-host-cmd" - STRING_DECLARE(CFGOPT_PG3_HOST_CMD_STR); -#define CFGOPT_PG3_HOST_CONFIG "pg3-host-config" - STRING_DECLARE(CFGOPT_PG3_HOST_CONFIG_STR); -#define CFGOPT_PG3_HOST_CONFIG_INCLUDE_PATH "pg3-host-config-include-path" - STRING_DECLARE(CFGOPT_PG3_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG3_HOST_CONFIG_PATH "pg3-host-config-path" - STRING_DECLARE(CFGOPT_PG3_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG3_HOST_PORT "pg3-host-port" - STRING_DECLARE(CFGOPT_PG3_HOST_PORT_STR); -#define CFGOPT_PG3_HOST_USER "pg3-host-user" - STRING_DECLARE(CFGOPT_PG3_HOST_USER_STR); -#define CFGOPT_PG3_LOCAL "pg3-local" - STRING_DECLARE(CFGOPT_PG3_LOCAL_STR); -#define CFGOPT_PG3_PATH "pg3-path" - STRING_DECLARE(CFGOPT_PG3_PATH_STR); -#define CFGOPT_PG3_PORT "pg3-port" - STRING_DECLARE(CFGOPT_PG3_PORT_STR); -#define CFGOPT_PG3_SOCKET_PATH "pg3-socket-path" - STRING_DECLARE(CFGOPT_PG3_SOCKET_PATH_STR); -#define CFGOPT_PG3_USER "pg3-user" - STRING_DECLARE(CFGOPT_PG3_USER_STR); -#define CFGOPT_PG4_HOST "pg4-host" - STRING_DECLARE(CFGOPT_PG4_HOST_STR); -#define CFGOPT_PG4_HOST_CMD "pg4-host-cmd" - STRING_DECLARE(CFGOPT_PG4_HOST_CMD_STR); -#define CFGOPT_PG4_HOST_CONFIG "pg4-host-config" - STRING_DECLARE(CFGOPT_PG4_HOST_CONFIG_STR); -#define CFGOPT_PG4_HOST_CONFIG_INCLUDE_PATH "pg4-host-config-include-path" - STRING_DECLARE(CFGOPT_PG4_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG4_HOST_CONFIG_PATH "pg4-host-config-path" - STRING_DECLARE(CFGOPT_PG4_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG4_HOST_PORT "pg4-host-port" - STRING_DECLARE(CFGOPT_PG4_HOST_PORT_STR); -#define CFGOPT_PG4_HOST_USER "pg4-host-user" - STRING_DECLARE(CFGOPT_PG4_HOST_USER_STR); -#define CFGOPT_PG4_LOCAL "pg4-local" - STRING_DECLARE(CFGOPT_PG4_LOCAL_STR); -#define CFGOPT_PG4_PATH "pg4-path" - STRING_DECLARE(CFGOPT_PG4_PATH_STR); -#define CFGOPT_PG4_PORT "pg4-port" - STRING_DECLARE(CFGOPT_PG4_PORT_STR); -#define CFGOPT_PG4_SOCKET_PATH "pg4-socket-path" - STRING_DECLARE(CFGOPT_PG4_SOCKET_PATH_STR); -#define CFGOPT_PG4_USER "pg4-user" - STRING_DECLARE(CFGOPT_PG4_USER_STR); -#define CFGOPT_PG5_HOST "pg5-host" - STRING_DECLARE(CFGOPT_PG5_HOST_STR); -#define CFGOPT_PG5_HOST_CMD "pg5-host-cmd" - STRING_DECLARE(CFGOPT_PG5_HOST_CMD_STR); -#define CFGOPT_PG5_HOST_CONFIG "pg5-host-config" - STRING_DECLARE(CFGOPT_PG5_HOST_CONFIG_STR); -#define CFGOPT_PG5_HOST_CONFIG_INCLUDE_PATH "pg5-host-config-include-path" - STRING_DECLARE(CFGOPT_PG5_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG5_HOST_CONFIG_PATH "pg5-host-config-path" - STRING_DECLARE(CFGOPT_PG5_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG5_HOST_PORT "pg5-host-port" - STRING_DECLARE(CFGOPT_PG5_HOST_PORT_STR); -#define CFGOPT_PG5_HOST_USER "pg5-host-user" - STRING_DECLARE(CFGOPT_PG5_HOST_USER_STR); -#define CFGOPT_PG5_LOCAL "pg5-local" - STRING_DECLARE(CFGOPT_PG5_LOCAL_STR); -#define CFGOPT_PG5_PATH "pg5-path" - STRING_DECLARE(CFGOPT_PG5_PATH_STR); -#define CFGOPT_PG5_PORT "pg5-port" - STRING_DECLARE(CFGOPT_PG5_PORT_STR); -#define CFGOPT_PG5_SOCKET_PATH "pg5-socket-path" - STRING_DECLARE(CFGOPT_PG5_SOCKET_PATH_STR); -#define CFGOPT_PG5_USER "pg5-user" - STRING_DECLARE(CFGOPT_PG5_USER_STR); -#define CFGOPT_PG6_HOST "pg6-host" - STRING_DECLARE(CFGOPT_PG6_HOST_STR); -#define CFGOPT_PG6_HOST_CMD "pg6-host-cmd" - STRING_DECLARE(CFGOPT_PG6_HOST_CMD_STR); -#define CFGOPT_PG6_HOST_CONFIG "pg6-host-config" - STRING_DECLARE(CFGOPT_PG6_HOST_CONFIG_STR); -#define CFGOPT_PG6_HOST_CONFIG_INCLUDE_PATH "pg6-host-config-include-path" - STRING_DECLARE(CFGOPT_PG6_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG6_HOST_CONFIG_PATH "pg6-host-config-path" - STRING_DECLARE(CFGOPT_PG6_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG6_HOST_PORT "pg6-host-port" - STRING_DECLARE(CFGOPT_PG6_HOST_PORT_STR); -#define CFGOPT_PG6_HOST_USER "pg6-host-user" - STRING_DECLARE(CFGOPT_PG6_HOST_USER_STR); -#define CFGOPT_PG6_LOCAL "pg6-local" - STRING_DECLARE(CFGOPT_PG6_LOCAL_STR); -#define CFGOPT_PG6_PATH "pg6-path" - STRING_DECLARE(CFGOPT_PG6_PATH_STR); -#define CFGOPT_PG6_PORT "pg6-port" - STRING_DECLARE(CFGOPT_PG6_PORT_STR); -#define CFGOPT_PG6_SOCKET_PATH "pg6-socket-path" - STRING_DECLARE(CFGOPT_PG6_SOCKET_PATH_STR); -#define CFGOPT_PG6_USER "pg6-user" - STRING_DECLARE(CFGOPT_PG6_USER_STR); -#define CFGOPT_PG7_HOST "pg7-host" - STRING_DECLARE(CFGOPT_PG7_HOST_STR); -#define CFGOPT_PG7_HOST_CMD "pg7-host-cmd" - STRING_DECLARE(CFGOPT_PG7_HOST_CMD_STR); -#define CFGOPT_PG7_HOST_CONFIG "pg7-host-config" - STRING_DECLARE(CFGOPT_PG7_HOST_CONFIG_STR); -#define CFGOPT_PG7_HOST_CONFIG_INCLUDE_PATH "pg7-host-config-include-path" - STRING_DECLARE(CFGOPT_PG7_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG7_HOST_CONFIG_PATH "pg7-host-config-path" - STRING_DECLARE(CFGOPT_PG7_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG7_HOST_PORT "pg7-host-port" - STRING_DECLARE(CFGOPT_PG7_HOST_PORT_STR); -#define CFGOPT_PG7_HOST_USER "pg7-host-user" - STRING_DECLARE(CFGOPT_PG7_HOST_USER_STR); -#define CFGOPT_PG7_LOCAL "pg7-local" - STRING_DECLARE(CFGOPT_PG7_LOCAL_STR); -#define CFGOPT_PG7_PATH "pg7-path" - STRING_DECLARE(CFGOPT_PG7_PATH_STR); -#define CFGOPT_PG7_PORT "pg7-port" - STRING_DECLARE(CFGOPT_PG7_PORT_STR); -#define CFGOPT_PG7_SOCKET_PATH "pg7-socket-path" - STRING_DECLARE(CFGOPT_PG7_SOCKET_PATH_STR); -#define CFGOPT_PG7_USER "pg7-user" - STRING_DECLARE(CFGOPT_PG7_USER_STR); -#define CFGOPT_PG8_HOST "pg8-host" - STRING_DECLARE(CFGOPT_PG8_HOST_STR); -#define CFGOPT_PG8_HOST_CMD "pg8-host-cmd" - STRING_DECLARE(CFGOPT_PG8_HOST_CMD_STR); -#define CFGOPT_PG8_HOST_CONFIG "pg8-host-config" - STRING_DECLARE(CFGOPT_PG8_HOST_CONFIG_STR); -#define CFGOPT_PG8_HOST_CONFIG_INCLUDE_PATH "pg8-host-config-include-path" - STRING_DECLARE(CFGOPT_PG8_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_PG8_HOST_CONFIG_PATH "pg8-host-config-path" - STRING_DECLARE(CFGOPT_PG8_HOST_CONFIG_PATH_STR); -#define CFGOPT_PG8_HOST_PORT "pg8-host-port" - STRING_DECLARE(CFGOPT_PG8_HOST_PORT_STR); -#define CFGOPT_PG8_HOST_USER "pg8-host-user" - STRING_DECLARE(CFGOPT_PG8_HOST_USER_STR); -#define CFGOPT_PG8_LOCAL "pg8-local" - STRING_DECLARE(CFGOPT_PG8_LOCAL_STR); -#define CFGOPT_PG8_PATH "pg8-path" - STRING_DECLARE(CFGOPT_PG8_PATH_STR); -#define CFGOPT_PG8_PORT "pg8-port" - STRING_DECLARE(CFGOPT_PG8_PORT_STR); -#define CFGOPT_PG8_SOCKET_PATH "pg8-socket-path" - STRING_DECLARE(CFGOPT_PG8_SOCKET_PATH_STR); -#define CFGOPT_PG8_USER "pg8-user" - STRING_DECLARE(CFGOPT_PG8_USER_STR); #define CFGOPT_PROCESS "process" STRING_DECLARE(CFGOPT_PROCESS_STR); #define CFGOPT_PROCESS_MAX "process-max" @@ -352,90 +160,6 @@ Option constants STRING_DECLARE(CFGOPT_RECURSE_STR); #define CFGOPT_REMOTE_TYPE "remote-type" STRING_DECLARE(CFGOPT_REMOTE_TYPE_STR); -#define CFGOPT_REPO1_AZURE_ACCOUNT "repo1-azure-account" - STRING_DECLARE(CFGOPT_REPO1_AZURE_ACCOUNT_STR); -#define CFGOPT_REPO1_AZURE_CA_FILE "repo1-azure-ca-file" - STRING_DECLARE(CFGOPT_REPO1_AZURE_CA_FILE_STR); -#define CFGOPT_REPO1_AZURE_CA_PATH "repo1-azure-ca-path" - STRING_DECLARE(CFGOPT_REPO1_AZURE_CA_PATH_STR); -#define CFGOPT_REPO1_AZURE_CONTAINER "repo1-azure-container" - STRING_DECLARE(CFGOPT_REPO1_AZURE_CONTAINER_STR); -#define CFGOPT_REPO1_AZURE_ENDPOINT "repo1-azure-endpoint" - STRING_DECLARE(CFGOPT_REPO1_AZURE_ENDPOINT_STR); -#define CFGOPT_REPO1_AZURE_HOST "repo1-azure-host" - STRING_DECLARE(CFGOPT_REPO1_AZURE_HOST_STR); -#define CFGOPT_REPO1_AZURE_KEY "repo1-azure-key" - STRING_DECLARE(CFGOPT_REPO1_AZURE_KEY_STR); -#define CFGOPT_REPO1_AZURE_KEY_TYPE "repo1-azure-key-type" - STRING_DECLARE(CFGOPT_REPO1_AZURE_KEY_TYPE_STR); -#define CFGOPT_REPO1_AZURE_PORT "repo1-azure-port" - STRING_DECLARE(CFGOPT_REPO1_AZURE_PORT_STR); -#define CFGOPT_REPO1_AZURE_VERIFY_TLS "repo1-azure-verify-tls" - STRING_DECLARE(CFGOPT_REPO1_AZURE_VERIFY_TLS_STR); -#define CFGOPT_REPO1_CIPHER_PASS "repo1-cipher-pass" - STRING_DECLARE(CFGOPT_REPO1_CIPHER_PASS_STR); -#define CFGOPT_REPO1_CIPHER_TYPE "repo1-cipher-type" - STRING_DECLARE(CFGOPT_REPO1_CIPHER_TYPE_STR); -#define CFGOPT_REPO1_HARDLINK "repo1-hardlink" - STRING_DECLARE(CFGOPT_REPO1_HARDLINK_STR); -#define CFGOPT_REPO1_HOST "repo1-host" - STRING_DECLARE(CFGOPT_REPO1_HOST_STR); -#define CFGOPT_REPO1_HOST_CMD "repo1-host-cmd" - STRING_DECLARE(CFGOPT_REPO1_HOST_CMD_STR); -#define CFGOPT_REPO1_HOST_CONFIG "repo1-host-config" - STRING_DECLARE(CFGOPT_REPO1_HOST_CONFIG_STR); -#define CFGOPT_REPO1_HOST_CONFIG_INCLUDE_PATH "repo1-host-config-include-path" - STRING_DECLARE(CFGOPT_REPO1_HOST_CONFIG_INCLUDE_PATH_STR); -#define CFGOPT_REPO1_HOST_CONFIG_PATH "repo1-host-config-path" - STRING_DECLARE(CFGOPT_REPO1_HOST_CONFIG_PATH_STR); -#define CFGOPT_REPO1_HOST_PORT "repo1-host-port" - STRING_DECLARE(CFGOPT_REPO1_HOST_PORT_STR); -#define CFGOPT_REPO1_HOST_USER "repo1-host-user" - STRING_DECLARE(CFGOPT_REPO1_HOST_USER_STR); -#define CFGOPT_REPO1_LOCAL "repo1-local" - STRING_DECLARE(CFGOPT_REPO1_LOCAL_STR); -#define CFGOPT_REPO1_PATH "repo1-path" - STRING_DECLARE(CFGOPT_REPO1_PATH_STR); -#define CFGOPT_REPO1_RETENTION_ARCHIVE "repo1-retention-archive" - STRING_DECLARE(CFGOPT_REPO1_RETENTION_ARCHIVE_STR); -#define CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE "repo1-retention-archive-type" - STRING_DECLARE(CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE_STR); -#define CFGOPT_REPO1_RETENTION_DIFF "repo1-retention-diff" - STRING_DECLARE(CFGOPT_REPO1_RETENTION_DIFF_STR); -#define CFGOPT_REPO1_RETENTION_FULL "repo1-retention-full" - STRING_DECLARE(CFGOPT_REPO1_RETENTION_FULL_STR); -#define CFGOPT_REPO1_RETENTION_FULL_TYPE "repo1-retention-full-type" - STRING_DECLARE(CFGOPT_REPO1_RETENTION_FULL_TYPE_STR); -#define CFGOPT_REPO1_S3_BUCKET "repo1-s3-bucket" - STRING_DECLARE(CFGOPT_REPO1_S3_BUCKET_STR); -#define CFGOPT_REPO1_S3_CA_FILE "repo1-s3-ca-file" - STRING_DECLARE(CFGOPT_REPO1_S3_CA_FILE_STR); -#define CFGOPT_REPO1_S3_CA_PATH "repo1-s3-ca-path" - STRING_DECLARE(CFGOPT_REPO1_S3_CA_PATH_STR); -#define CFGOPT_REPO1_S3_ENDPOINT "repo1-s3-endpoint" - STRING_DECLARE(CFGOPT_REPO1_S3_ENDPOINT_STR); -#define CFGOPT_REPO1_S3_HOST "repo1-s3-host" - STRING_DECLARE(CFGOPT_REPO1_S3_HOST_STR); -#define CFGOPT_REPO1_S3_KEY "repo1-s3-key" - STRING_DECLARE(CFGOPT_REPO1_S3_KEY_STR); -#define CFGOPT_REPO1_S3_KEY_SECRET "repo1-s3-key-secret" - STRING_DECLARE(CFGOPT_REPO1_S3_KEY_SECRET_STR); -#define CFGOPT_REPO1_S3_KEY_TYPE "repo1-s3-key-type" - STRING_DECLARE(CFGOPT_REPO1_S3_KEY_TYPE_STR); -#define CFGOPT_REPO1_S3_PORT "repo1-s3-port" - STRING_DECLARE(CFGOPT_REPO1_S3_PORT_STR); -#define CFGOPT_REPO1_S3_REGION "repo1-s3-region" - STRING_DECLARE(CFGOPT_REPO1_S3_REGION_STR); -#define CFGOPT_REPO1_S3_ROLE "repo1-s3-role" - STRING_DECLARE(CFGOPT_REPO1_S3_ROLE_STR); -#define CFGOPT_REPO1_S3_TOKEN "repo1-s3-token" - STRING_DECLARE(CFGOPT_REPO1_S3_TOKEN_STR); -#define CFGOPT_REPO1_S3_URI_STYLE "repo1-s3-uri-style" - STRING_DECLARE(CFGOPT_REPO1_S3_URI_STYLE_STR); -#define CFGOPT_REPO1_S3_VERIFY_TLS "repo1-s3-verify-tls" - STRING_DECLARE(CFGOPT_REPO1_S3_VERIFY_TLS_STR); -#define CFGOPT_REPO1_TYPE "repo1-type" - STRING_DECLARE(CFGOPT_REPO1_TYPE_STR); #define CFGOPT_RESUME "resume" STRING_DECLARE(CFGOPT_RESUME_STR); #define CFGOPT_SCK_BLOCK "sck-block" diff --git a/src/config/load.c b/src/config/load.c index 545ae6e0f..096a5b91d 100644 --- a/src/config/load.c +++ b/src/config/load.c @@ -161,7 +161,7 @@ cfgLoadUpdateOption(void) const String *archiveRetentionType = cfgOptionStr(cfgOptRepoRetentionArchiveType + optionIdx); const String *msgArchiveOff = strNewFmt( - "WAL segments will not be expired: option '" CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE "=%s' but", + "WAL segments will not be expired: option '%s=%s' but", cfgOptionName(cfgOptRepoRetentionArchiveType + optionIdx), strZ(archiveRetentionType)); // If the archive retention is not explicitly set then determine what it should be defaulted to @@ -229,11 +229,11 @@ cfgLoadUpdateOption(void) { THROW_FMT( OptionInvalidValueError, - "'%s' is not valid for option '" CFGOPT_REPO1_S3_BUCKET "'" + "'%s' is not valid for option '%s'" "\nHINT: RFC-2818 forbids dots in wildcard matches." "\nHINT: TLS/SSL verification cannot proceed with this bucket name." "\nHINT: remove dots from the bucket name.", - strZ(cfgOptionStr(cfgOptRepoS3Bucket))); + strZ(cfgOptionStr(cfgOptRepoS3Bucket)), cfgOptionName(cfgOptRepoS3Bucket)); } // Check/update compress-type if compress is valid. There should be no references to the compress option outside this block. diff --git a/src/config/parse.auto.c b/src/config/parse.auto.c index ac4441b8f..634a7e881 100644 --- a/src/config/parse.auto.c +++ b/src/config/parse.auto.c @@ -12,81 +12,81 @@ static const struct option optionList[] = // archive-async option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ARCHIVE_ASYNC, + .name = "archive-async", .val = PARSE_OPTION_FLAG | cfgOptArchiveAsync, }, { - .name = "no-" CFGOPT_ARCHIVE_ASYNC, + .name = "no-archive-async", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveAsync, }, { - .name = "reset-" CFGOPT_ARCHIVE_ASYNC, + .name = "reset-archive-async", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptArchiveAsync, }, // archive-check option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ARCHIVE_CHECK, + .name = "archive-check", .val = PARSE_OPTION_FLAG | cfgOptArchiveCheck, }, { - .name = "no-" CFGOPT_ARCHIVE_CHECK, + .name = "no-archive-check", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveCheck, }, { - .name = "reset-" CFGOPT_ARCHIVE_CHECK, + .name = "reset-archive-check", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptArchiveCheck, }, // archive-copy option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ARCHIVE_COPY, + .name = "archive-copy", .val = PARSE_OPTION_FLAG | cfgOptArchiveCopy, }, { - .name = "no-" CFGOPT_ARCHIVE_COPY, + .name = "no-archive-copy", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveCopy, }, { - .name = "reset-" CFGOPT_ARCHIVE_COPY, + .name = "reset-archive-copy", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptArchiveCopy, }, // archive-get-queue-max option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ARCHIVE_GET_QUEUE_MAX, + .name = "archive-get-queue-max", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptArchiveGetQueueMax, }, { - .name = "reset-" CFGOPT_ARCHIVE_GET_QUEUE_MAX, + .name = "reset-archive-get-queue-max", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptArchiveGetQueueMax, }, // archive-mode option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ARCHIVE_MODE, + .name = "archive-mode", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptArchiveMode, }, { - .name = "reset-" CFGOPT_ARCHIVE_MODE, + .name = "reset-archive-mode", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptArchiveMode, }, // archive-push-queue-max option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ARCHIVE_PUSH_QUEUE_MAX, + .name = "archive-push-queue-max", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptArchivePushQueueMax, }, { - .name = "reset-" CFGOPT_ARCHIVE_PUSH_QUEUE_MAX, + .name = "reset-archive-push-queue-max", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptArchivePushQueueMax, }, { @@ -102,61 +102,61 @@ static const struct option optionList[] = // archive-timeout option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ARCHIVE_TIMEOUT, + .name = "archive-timeout", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptArchiveTimeout, }, { - .name = "reset-" CFGOPT_ARCHIVE_TIMEOUT, + .name = "reset-archive-timeout", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptArchiveTimeout, }, // backup-standby option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_BACKUP_STANDBY, + .name = "backup-standby", .val = PARSE_OPTION_FLAG | cfgOptBackupStandby, }, { - .name = "no-" CFGOPT_BACKUP_STANDBY, + .name = "no-backup-standby", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBackupStandby, }, { - .name = "reset-" CFGOPT_BACKUP_STANDBY, + .name = "reset-backup-standby", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptBackupStandby, }, // buffer-size option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_BUFFER_SIZE, + .name = "buffer-size", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptBufferSize, }, { - .name = "reset-" CFGOPT_BUFFER_SIZE, + .name = "reset-buffer-size", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptBufferSize, }, // checksum-page option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_CHECKSUM_PAGE, + .name = "checksum-page", .val = PARSE_OPTION_FLAG | cfgOptChecksumPage, }, { - .name = "no-" CFGOPT_CHECKSUM_PAGE, + .name = "no-checksum-page", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptChecksumPage, }, { - .name = "reset-" CFGOPT_CHECKSUM_PAGE, + .name = "reset-checksum-page", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptChecksumPage, }, // cipher-pass option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_CIPHER_PASS, + .name = "cipher-pass", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptCipherPass, }, @@ -164,82 +164,82 @@ static const struct option optionList[] = // cmd-ssh option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_CMD_SSH, + .name = "cmd-ssh", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptCmdSsh, }, { - .name = "reset-" CFGOPT_CMD_SSH, + .name = "reset-cmd-ssh", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptCmdSsh, }, // compress option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_COMPRESS, + .name = "compress", .val = PARSE_OPTION_FLAG | cfgOptCompress, }, { - .name = "no-" CFGOPT_COMPRESS, + .name = "no-compress", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptCompress, }, { - .name = "reset-" CFGOPT_COMPRESS, + .name = "reset-compress", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptCompress, }, // compress-level option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_COMPRESS_LEVEL, + .name = "compress-level", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptCompressLevel, }, { - .name = "reset-" CFGOPT_COMPRESS_LEVEL, + .name = "reset-compress-level", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptCompressLevel, }, // compress-level-network option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_COMPRESS_LEVEL_NETWORK, + .name = "compress-level-network", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptCompressLevelNetwork, }, { - .name = "reset-" CFGOPT_COMPRESS_LEVEL_NETWORK, + .name = "reset-compress-level-network", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptCompressLevelNetwork, }, // compress-type option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_COMPRESS_TYPE, + .name = "compress-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptCompressType, }, { - .name = "reset-" CFGOPT_COMPRESS_TYPE, + .name = "reset-compress-type", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptCompressType, }, // config option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_CONFIG, + .name = "config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptConfig, }, { - .name = "no-" CFGOPT_CONFIG, + .name = "no-config", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptConfig, }, // config-include-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_CONFIG_INCLUDE_PATH, + .name = "config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptConfigIncludePath, }, @@ -247,7 +247,7 @@ static const struct option optionList[] = // config-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_CONFIG_PATH, + .name = "config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptConfigPath, }, @@ -255,80 +255,80 @@ static const struct option optionList[] = // db-include option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_DB_INCLUDE, + .name = "db-include", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptDbInclude, }, { - .name = "reset-" CFGOPT_DB_INCLUDE, + .name = "reset-db-include", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptDbInclude, }, // db-timeout option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_DB_TIMEOUT, + .name = "db-timeout", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptDbTimeout, }, { - .name = "reset-" CFGOPT_DB_TIMEOUT, + .name = "reset-db-timeout", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptDbTimeout, }, // delta option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_DELTA, + .name = "delta", .val = PARSE_OPTION_FLAG | cfgOptDelta, }, { - .name = "no-" CFGOPT_DELTA, + .name = "no-delta", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDelta, }, { - .name = "reset-" CFGOPT_DELTA, + .name = "reset-delta", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptDelta, }, // dry-run option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_DRY_RUN, + .name = "dry-run", .val = PARSE_OPTION_FLAG | cfgOptDryRun, }, // exclude option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_EXCLUDE, + .name = "exclude", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptExclude, }, { - .name = "reset-" CFGOPT_EXCLUDE, + .name = "reset-exclude", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptExclude, }, // expire-auto option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_EXPIRE_AUTO, + .name = "expire-auto", .val = PARSE_OPTION_FLAG | cfgOptExpireAuto, }, { - .name = "no-" CFGOPT_EXPIRE_AUTO, + .name = "no-expire-auto", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptExpireAuto, }, { - .name = "reset-" CFGOPT_EXPIRE_AUTO, + .name = "reset-expire-auto", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptExpireAuto, }, // filter option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_FILTER, + .name = "filter", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptFilter, }, @@ -336,14 +336,14 @@ static const struct option optionList[] = // force option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_FORCE, + .name = "force", .val = PARSE_OPTION_FLAG | cfgOptForce, }, // host-id option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_HOST_ID, + .name = "host-id", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptHostId, }, @@ -351,181 +351,181 @@ static const struct option optionList[] = // ignore-missing option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_IGNORE_MISSING, + .name = "ignore-missing", .val = PARSE_OPTION_FLAG | cfgOptIgnoreMissing, }, // io-timeout option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_IO_TIMEOUT, + .name = "io-timeout", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptIoTimeout, }, { - .name = "reset-" CFGOPT_IO_TIMEOUT, + .name = "reset-io-timeout", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptIoTimeout, }, // link-all option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LINK_ALL, + .name = "link-all", .val = PARSE_OPTION_FLAG | cfgOptLinkAll, }, { - .name = "no-" CFGOPT_LINK_ALL, + .name = "no-link-all", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLinkAll, }, { - .name = "reset-" CFGOPT_LINK_ALL, + .name = "reset-link-all", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLinkAll, }, // link-map option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LINK_MAP, + .name = "link-map", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptLinkMap, }, { - .name = "reset-" CFGOPT_LINK_MAP, + .name = "reset-link-map", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLinkMap, }, // lock-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LOCK_PATH, + .name = "lock-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptLockPath, }, { - .name = "reset-" CFGOPT_LOCK_PATH, + .name = "reset-lock-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLockPath, }, // log-level-console option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LOG_LEVEL_CONSOLE, + .name = "log-level-console", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptLogLevelConsole, }, { - .name = "reset-" CFGOPT_LOG_LEVEL_CONSOLE, + .name = "reset-log-level-console", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLogLevelConsole, }, // log-level-file option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LOG_LEVEL_FILE, + .name = "log-level-file", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptLogLevelFile, }, { - .name = "reset-" CFGOPT_LOG_LEVEL_FILE, + .name = "reset-log-level-file", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLogLevelFile, }, // log-level-stderr option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LOG_LEVEL_STDERR, + .name = "log-level-stderr", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptLogLevelStderr, }, { - .name = "reset-" CFGOPT_LOG_LEVEL_STDERR, + .name = "reset-log-level-stderr", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLogLevelStderr, }, // log-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LOG_PATH, + .name = "log-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptLogPath, }, { - .name = "reset-" CFGOPT_LOG_PATH, + .name = "reset-log-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLogPath, }, // log-subprocess option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LOG_SUBPROCESS, + .name = "log-subprocess", .val = PARSE_OPTION_FLAG | cfgOptLogSubprocess, }, { - .name = "no-" CFGOPT_LOG_SUBPROCESS, + .name = "no-log-subprocess", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLogSubprocess, }, { - .name = "reset-" CFGOPT_LOG_SUBPROCESS, + .name = "reset-log-subprocess", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLogSubprocess, }, // log-timestamp option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_LOG_TIMESTAMP, + .name = "log-timestamp", .val = PARSE_OPTION_FLAG | cfgOptLogTimestamp, }, { - .name = "no-" CFGOPT_LOG_TIMESTAMP, + .name = "no-log-timestamp", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLogTimestamp, }, { - .name = "reset-" CFGOPT_LOG_TIMESTAMP, + .name = "reset-log-timestamp", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptLogTimestamp, }, // manifest-save-threshold option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_MANIFEST_SAVE_THRESHOLD, + .name = "manifest-save-threshold", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptManifestSaveThreshold, }, { - .name = "reset-" CFGOPT_MANIFEST_SAVE_THRESHOLD, + .name = "reset-manifest-save-threshold", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptManifestSaveThreshold, }, // neutral-umask option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_NEUTRAL_UMASK, + .name = "neutral-umask", .val = PARSE_OPTION_FLAG | cfgOptNeutralUmask, }, { - .name = "no-" CFGOPT_NEUTRAL_UMASK, + .name = "no-neutral-umask", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptNeutralUmask, }, { - .name = "reset-" CFGOPT_NEUTRAL_UMASK, + .name = "reset-neutral-umask", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptNeutralUmask, }, // online option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_ONLINE, + .name = "online", .val = PARSE_OPTION_FLAG | cfgOptOnline, }, { - .name = "no-" CFGOPT_ONLINE, + .name = "no-online", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptOnline, }, // output option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_OUTPUT, + .name = "output", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptOutput, }, @@ -533,12 +533,12 @@ static const struct option optionList[] = // pg-host option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_HOST, + .name = "pg1-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgHost, }, { - .name = "reset-" CFGOPT_PG1_HOST, + .name = "reset-pg1-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgHost, }, { @@ -552,12 +552,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHost, }, { - .name = CFGOPT_PG2_HOST, + .name = "pg2-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 1), }, { - .name = "reset-" CFGOPT_PG2_HOST, + .name = "reset-pg2-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHost + 1), }, { @@ -566,12 +566,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 1), }, { - .name = CFGOPT_PG3_HOST, + .name = "pg3-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 2), }, { - .name = "reset-" CFGOPT_PG3_HOST, + .name = "reset-pg3-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHost + 2), }, { @@ -580,12 +580,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 2), }, { - .name = CFGOPT_PG4_HOST, + .name = "pg4-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 3), }, { - .name = "reset-" CFGOPT_PG4_HOST, + .name = "reset-pg4-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHost + 3), }, { @@ -594,12 +594,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 3), }, { - .name = CFGOPT_PG5_HOST, + .name = "pg5-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 4), }, { - .name = "reset-" CFGOPT_PG5_HOST, + .name = "reset-pg5-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHost + 4), }, { @@ -608,12 +608,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 4), }, { - .name = CFGOPT_PG6_HOST, + .name = "pg6-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 5), }, { - .name = "reset-" CFGOPT_PG6_HOST, + .name = "reset-pg6-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHost + 5), }, { @@ -622,12 +622,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 5), }, { - .name = CFGOPT_PG7_HOST, + .name = "pg7-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 6), }, { - .name = "reset-" CFGOPT_PG7_HOST, + .name = "reset-pg7-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHost + 6), }, { @@ -636,12 +636,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 6), }, { - .name = CFGOPT_PG8_HOST, + .name = "pg8-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 7), }, { - .name = "reset-" CFGOPT_PG8_HOST, + .name = "reset-pg8-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHost + 7), }, { @@ -653,12 +653,12 @@ static const struct option optionList[] = // pg-host-cmd option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_HOST_CMD, + .name = "pg1-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgHostCmd, }, { - .name = "reset-" CFGOPT_PG1_HOST_CMD, + .name = "reset-pg1-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgHostCmd, }, { @@ -672,12 +672,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostCmd, }, { - .name = CFGOPT_PG2_HOST_CMD, + .name = "pg2-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 1), }, { - .name = "reset-" CFGOPT_PG2_HOST_CMD, + .name = "reset-pg2-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostCmd + 1), }, { @@ -686,12 +686,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 1), }, { - .name = CFGOPT_PG3_HOST_CMD, + .name = "pg3-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 2), }, { - .name = "reset-" CFGOPT_PG3_HOST_CMD, + .name = "reset-pg3-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostCmd + 2), }, { @@ -700,12 +700,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 2), }, { - .name = CFGOPT_PG4_HOST_CMD, + .name = "pg4-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 3), }, { - .name = "reset-" CFGOPT_PG4_HOST_CMD, + .name = "reset-pg4-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostCmd + 3), }, { @@ -714,12 +714,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 3), }, { - .name = CFGOPT_PG5_HOST_CMD, + .name = "pg5-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 4), }, { - .name = "reset-" CFGOPT_PG5_HOST_CMD, + .name = "reset-pg5-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostCmd + 4), }, { @@ -728,12 +728,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 4), }, { - .name = CFGOPT_PG6_HOST_CMD, + .name = "pg6-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 5), }, { - .name = "reset-" CFGOPT_PG6_HOST_CMD, + .name = "reset-pg6-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostCmd + 5), }, { @@ -742,12 +742,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 5), }, { - .name = CFGOPT_PG7_HOST_CMD, + .name = "pg7-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 6), }, { - .name = "reset-" CFGOPT_PG7_HOST_CMD, + .name = "reset-pg7-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostCmd + 6), }, { @@ -756,12 +756,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 6), }, { - .name = CFGOPT_PG8_HOST_CMD, + .name = "pg8-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 7), }, { - .name = "reset-" CFGOPT_PG8_HOST_CMD, + .name = "reset-pg8-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostCmd + 7), }, { @@ -773,12 +773,12 @@ static const struct option optionList[] = // pg-host-config option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_HOST_CONFIG, + .name = "pg1-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgHostConfig, }, { - .name = "reset-" CFGOPT_PG1_HOST_CONFIG, + .name = "reset-pg1-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgHostConfig, }, { @@ -792,12 +792,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostConfig, }, { - .name = CFGOPT_PG2_HOST_CONFIG, + .name = "pg2-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 1), }, { - .name = "reset-" CFGOPT_PG2_HOST_CONFIG, + .name = "reset-pg2-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfig + 1), }, { @@ -806,12 +806,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 1), }, { - .name = CFGOPT_PG3_HOST_CONFIG, + .name = "pg3-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 2), }, { - .name = "reset-" CFGOPT_PG3_HOST_CONFIG, + .name = "reset-pg3-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfig + 2), }, { @@ -820,12 +820,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 2), }, { - .name = CFGOPT_PG4_HOST_CONFIG, + .name = "pg4-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 3), }, { - .name = "reset-" CFGOPT_PG4_HOST_CONFIG, + .name = "reset-pg4-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfig + 3), }, { @@ -834,12 +834,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 3), }, { - .name = CFGOPT_PG5_HOST_CONFIG, + .name = "pg5-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 4), }, { - .name = "reset-" CFGOPT_PG5_HOST_CONFIG, + .name = "reset-pg5-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfig + 4), }, { @@ -848,12 +848,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 4), }, { - .name = CFGOPT_PG6_HOST_CONFIG, + .name = "pg6-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 5), }, { - .name = "reset-" CFGOPT_PG6_HOST_CONFIG, + .name = "reset-pg6-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfig + 5), }, { @@ -862,12 +862,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 5), }, { - .name = CFGOPT_PG7_HOST_CONFIG, + .name = "pg7-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 6), }, { - .name = "reset-" CFGOPT_PG7_HOST_CONFIG, + .name = "reset-pg7-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfig + 6), }, { @@ -876,12 +876,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 6), }, { - .name = CFGOPT_PG8_HOST_CONFIG, + .name = "pg8-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 7), }, { - .name = "reset-" CFGOPT_PG8_HOST_CONFIG, + .name = "reset-pg8-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfig + 7), }, { @@ -893,162 +893,162 @@ static const struct option optionList[] = // pg-host-config-include-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_HOST_CONFIG_INCLUDE_PATH, + .name = "pg1-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgHostConfigIncludePath, }, { - .name = "reset-" CFGOPT_PG1_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg1-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgHostConfigIncludePath, }, { - .name = CFGOPT_PG2_HOST_CONFIG_INCLUDE_PATH, + .name = "pg2-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigIncludePath + 1), }, { - .name = "reset-" CFGOPT_PG2_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg2-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigIncludePath + 1), }, { - .name = CFGOPT_PG3_HOST_CONFIG_INCLUDE_PATH, + .name = "pg3-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigIncludePath + 2), }, { - .name = "reset-" CFGOPT_PG3_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg3-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigIncludePath + 2), }, { - .name = CFGOPT_PG4_HOST_CONFIG_INCLUDE_PATH, + .name = "pg4-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigIncludePath + 3), }, { - .name = "reset-" CFGOPT_PG4_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg4-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigIncludePath + 3), }, { - .name = CFGOPT_PG5_HOST_CONFIG_INCLUDE_PATH, + .name = "pg5-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigIncludePath + 4), }, { - .name = "reset-" CFGOPT_PG5_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg5-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigIncludePath + 4), }, { - .name = CFGOPT_PG6_HOST_CONFIG_INCLUDE_PATH, + .name = "pg6-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigIncludePath + 5), }, { - .name = "reset-" CFGOPT_PG6_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg6-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigIncludePath + 5), }, { - .name = CFGOPT_PG7_HOST_CONFIG_INCLUDE_PATH, + .name = "pg7-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigIncludePath + 6), }, { - .name = "reset-" CFGOPT_PG7_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg7-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigIncludePath + 6), }, { - .name = CFGOPT_PG8_HOST_CONFIG_INCLUDE_PATH, + .name = "pg8-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigIncludePath + 7), }, { - .name = "reset-" CFGOPT_PG8_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-pg8-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigIncludePath + 7), }, // pg-host-config-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_HOST_CONFIG_PATH, + .name = "pg1-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgHostConfigPath, }, { - .name = "reset-" CFGOPT_PG1_HOST_CONFIG_PATH, + .name = "reset-pg1-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgHostConfigPath, }, { - .name = CFGOPT_PG2_HOST_CONFIG_PATH, + .name = "pg2-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigPath + 1), }, { - .name = "reset-" CFGOPT_PG2_HOST_CONFIG_PATH, + .name = "reset-pg2-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigPath + 1), }, { - .name = CFGOPT_PG3_HOST_CONFIG_PATH, + .name = "pg3-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigPath + 2), }, { - .name = "reset-" CFGOPT_PG3_HOST_CONFIG_PATH, + .name = "reset-pg3-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigPath + 2), }, { - .name = CFGOPT_PG4_HOST_CONFIG_PATH, + .name = "pg4-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigPath + 3), }, { - .name = "reset-" CFGOPT_PG4_HOST_CONFIG_PATH, + .name = "reset-pg4-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigPath + 3), }, { - .name = CFGOPT_PG5_HOST_CONFIG_PATH, + .name = "pg5-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigPath + 4), }, { - .name = "reset-" CFGOPT_PG5_HOST_CONFIG_PATH, + .name = "reset-pg5-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigPath + 4), }, { - .name = CFGOPT_PG6_HOST_CONFIG_PATH, + .name = "pg6-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigPath + 5), }, { - .name = "reset-" CFGOPT_PG6_HOST_CONFIG_PATH, + .name = "reset-pg6-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigPath + 5), }, { - .name = CFGOPT_PG7_HOST_CONFIG_PATH, + .name = "pg7-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigPath + 6), }, { - .name = "reset-" CFGOPT_PG7_HOST_CONFIG_PATH, + .name = "reset-pg7-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigPath + 6), }, { - .name = CFGOPT_PG8_HOST_CONFIG_PATH, + .name = "pg8-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfigPath + 7), }, { - .name = "reset-" CFGOPT_PG8_HOST_CONFIG_PATH, + .name = "reset-pg8-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostConfigPath + 7), }, // pg-host-port option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_HOST_PORT, + .name = "pg1-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgHostPort, }, { - .name = "reset-" CFGOPT_PG1_HOST_PORT, + .name = "reset-pg1-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgHostPort, }, { @@ -1062,12 +1062,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostPort, }, { - .name = CFGOPT_PG2_HOST_PORT, + .name = "pg2-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 1), }, { - .name = "reset-" CFGOPT_PG2_HOST_PORT, + .name = "reset-pg2-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostPort + 1), }, { @@ -1076,12 +1076,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 1), }, { - .name = CFGOPT_PG3_HOST_PORT, + .name = "pg3-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 2), }, { - .name = "reset-" CFGOPT_PG3_HOST_PORT, + .name = "reset-pg3-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostPort + 2), }, { @@ -1090,12 +1090,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 2), }, { - .name = CFGOPT_PG4_HOST_PORT, + .name = "pg4-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 3), }, { - .name = "reset-" CFGOPT_PG4_HOST_PORT, + .name = "reset-pg4-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostPort + 3), }, { @@ -1104,12 +1104,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 3), }, { - .name = CFGOPT_PG5_HOST_PORT, + .name = "pg5-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 4), }, { - .name = "reset-" CFGOPT_PG5_HOST_PORT, + .name = "reset-pg5-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostPort + 4), }, { @@ -1118,12 +1118,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 4), }, { - .name = CFGOPT_PG6_HOST_PORT, + .name = "pg6-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 5), }, { - .name = "reset-" CFGOPT_PG6_HOST_PORT, + .name = "reset-pg6-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostPort + 5), }, { @@ -1132,12 +1132,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 5), }, { - .name = CFGOPT_PG7_HOST_PORT, + .name = "pg7-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 6), }, { - .name = "reset-" CFGOPT_PG7_HOST_PORT, + .name = "reset-pg7-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostPort + 6), }, { @@ -1146,12 +1146,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 6), }, { - .name = CFGOPT_PG8_HOST_PORT, + .name = "pg8-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 7), }, { - .name = "reset-" CFGOPT_PG8_HOST_PORT, + .name = "reset-pg8-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostPort + 7), }, { @@ -1163,12 +1163,12 @@ static const struct option optionList[] = // pg-host-user option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_HOST_USER, + .name = "pg1-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgHostUser, }, { - .name = "reset-" CFGOPT_PG1_HOST_USER, + .name = "reset-pg1-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgHostUser, }, { @@ -1182,12 +1182,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostUser, }, { - .name = CFGOPT_PG2_HOST_USER, + .name = "pg2-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 1), }, { - .name = "reset-" CFGOPT_PG2_HOST_USER, + .name = "reset-pg2-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostUser + 1), }, { @@ -1196,12 +1196,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 1), }, { - .name = CFGOPT_PG3_HOST_USER, + .name = "pg3-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 2), }, { - .name = "reset-" CFGOPT_PG3_HOST_USER, + .name = "reset-pg3-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostUser + 2), }, { @@ -1210,12 +1210,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 2), }, { - .name = CFGOPT_PG4_HOST_USER, + .name = "pg4-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 3), }, { - .name = "reset-" CFGOPT_PG4_HOST_USER, + .name = "reset-pg4-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostUser + 3), }, { @@ -1224,12 +1224,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 3), }, { - .name = CFGOPT_PG5_HOST_USER, + .name = "pg5-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 4), }, { - .name = "reset-" CFGOPT_PG5_HOST_USER, + .name = "reset-pg5-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostUser + 4), }, { @@ -1238,12 +1238,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 4), }, { - .name = CFGOPT_PG6_HOST_USER, + .name = "pg6-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 5), }, { - .name = "reset-" CFGOPT_PG6_HOST_USER, + .name = "reset-pg6-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostUser + 5), }, { @@ -1252,12 +1252,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 5), }, { - .name = CFGOPT_PG7_HOST_USER, + .name = "pg7-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 6), }, { - .name = "reset-" CFGOPT_PG7_HOST_USER, + .name = "reset-pg7-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostUser + 6), }, { @@ -1266,12 +1266,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 6), }, { - .name = CFGOPT_PG8_HOST_USER, + .name = "pg8-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 7), }, { - .name = "reset-" CFGOPT_PG8_HOST_USER, + .name = "reset-pg8-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgHostUser + 7), }, { @@ -1283,111 +1283,111 @@ static const struct option optionList[] = // pg-local option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_LOCAL, + .name = "pg1-local", .val = PARSE_OPTION_FLAG | cfgOptPgLocal, }, { - .name = "no-" CFGOPT_PG1_LOCAL, + .name = "no-pg1-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgLocal, }, { - .name = "reset-" CFGOPT_PG1_LOCAL, + .name = "reset-pg1-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgLocal, }, { - .name = CFGOPT_PG2_LOCAL, + .name = "pg2-local", .val = PARSE_OPTION_FLAG | (cfgOptPgLocal + 1), }, { - .name = "no-" CFGOPT_PG2_LOCAL, + .name = "no-pg2-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgLocal + 1), }, { - .name = "reset-" CFGOPT_PG2_LOCAL, + .name = "reset-pg2-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgLocal + 1), }, { - .name = CFGOPT_PG3_LOCAL, + .name = "pg3-local", .val = PARSE_OPTION_FLAG | (cfgOptPgLocal + 2), }, { - .name = "no-" CFGOPT_PG3_LOCAL, + .name = "no-pg3-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgLocal + 2), }, { - .name = "reset-" CFGOPT_PG3_LOCAL, + .name = "reset-pg3-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgLocal + 2), }, { - .name = CFGOPT_PG4_LOCAL, + .name = "pg4-local", .val = PARSE_OPTION_FLAG | (cfgOptPgLocal + 3), }, { - .name = "no-" CFGOPT_PG4_LOCAL, + .name = "no-pg4-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgLocal + 3), }, { - .name = "reset-" CFGOPT_PG4_LOCAL, + .name = "reset-pg4-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgLocal + 3), }, { - .name = CFGOPT_PG5_LOCAL, + .name = "pg5-local", .val = PARSE_OPTION_FLAG | (cfgOptPgLocal + 4), }, { - .name = "no-" CFGOPT_PG5_LOCAL, + .name = "no-pg5-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgLocal + 4), }, { - .name = "reset-" CFGOPT_PG5_LOCAL, + .name = "reset-pg5-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgLocal + 4), }, { - .name = CFGOPT_PG6_LOCAL, + .name = "pg6-local", .val = PARSE_OPTION_FLAG | (cfgOptPgLocal + 5), }, { - .name = "no-" CFGOPT_PG6_LOCAL, + .name = "no-pg6-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgLocal + 5), }, { - .name = "reset-" CFGOPT_PG6_LOCAL, + .name = "reset-pg6-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgLocal + 5), }, { - .name = CFGOPT_PG7_LOCAL, + .name = "pg7-local", .val = PARSE_OPTION_FLAG | (cfgOptPgLocal + 6), }, { - .name = "no-" CFGOPT_PG7_LOCAL, + .name = "no-pg7-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgLocal + 6), }, { - .name = "reset-" CFGOPT_PG7_LOCAL, + .name = "reset-pg7-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgLocal + 6), }, { - .name = CFGOPT_PG8_LOCAL, + .name = "pg8-local", .val = PARSE_OPTION_FLAG | (cfgOptPgLocal + 7), }, { - .name = "no-" CFGOPT_PG8_LOCAL, + .name = "no-pg8-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgLocal + 7), }, { - .name = "reset-" CFGOPT_PG8_LOCAL, + .name = "reset-pg8-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgLocal + 7), }, // pg-path option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_PATH, + .name = "pg1-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgPath, }, { - .name = "reset-" CFGOPT_PG1_PATH, + .name = "reset-pg1-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgPath, }, { @@ -1401,12 +1401,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgPath, }, { - .name = CFGOPT_PG2_PATH, + .name = "pg2-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 1), }, { - .name = "reset-" CFGOPT_PG2_PATH, + .name = "reset-pg2-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPath + 1), }, { @@ -1415,12 +1415,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 1), }, { - .name = CFGOPT_PG3_PATH, + .name = "pg3-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 2), }, { - .name = "reset-" CFGOPT_PG3_PATH, + .name = "reset-pg3-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPath + 2), }, { @@ -1429,12 +1429,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 2), }, { - .name = CFGOPT_PG4_PATH, + .name = "pg4-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 3), }, { - .name = "reset-" CFGOPT_PG4_PATH, + .name = "reset-pg4-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPath + 3), }, { @@ -1443,12 +1443,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 3), }, { - .name = CFGOPT_PG5_PATH, + .name = "pg5-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 4), }, { - .name = "reset-" CFGOPT_PG5_PATH, + .name = "reset-pg5-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPath + 4), }, { @@ -1457,12 +1457,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 4), }, { - .name = CFGOPT_PG6_PATH, + .name = "pg6-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 5), }, { - .name = "reset-" CFGOPT_PG6_PATH, + .name = "reset-pg6-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPath + 5), }, { @@ -1471,12 +1471,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 5), }, { - .name = CFGOPT_PG7_PATH, + .name = "pg7-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 6), }, { - .name = "reset-" CFGOPT_PG7_PATH, + .name = "reset-pg7-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPath + 6), }, { @@ -1485,12 +1485,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 6), }, { - .name = CFGOPT_PG8_PATH, + .name = "pg8-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 7), }, { - .name = "reset-" CFGOPT_PG8_PATH, + .name = "reset-pg8-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPath + 7), }, { @@ -1502,12 +1502,12 @@ static const struct option optionList[] = // pg-port option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_PORT, + .name = "pg1-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgPort, }, { - .name = "reset-" CFGOPT_PG1_PORT, + .name = "reset-pg1-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgPort, }, { @@ -1521,12 +1521,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgPort, }, { - .name = CFGOPT_PG2_PORT, + .name = "pg2-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 1), }, { - .name = "reset-" CFGOPT_PG2_PORT, + .name = "reset-pg2-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPort + 1), }, { @@ -1535,12 +1535,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 1), }, { - .name = CFGOPT_PG3_PORT, + .name = "pg3-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 2), }, { - .name = "reset-" CFGOPT_PG3_PORT, + .name = "reset-pg3-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPort + 2), }, { @@ -1549,12 +1549,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 2), }, { - .name = CFGOPT_PG4_PORT, + .name = "pg4-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 3), }, { - .name = "reset-" CFGOPT_PG4_PORT, + .name = "reset-pg4-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPort + 3), }, { @@ -1563,12 +1563,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 3), }, { - .name = CFGOPT_PG5_PORT, + .name = "pg5-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 4), }, { - .name = "reset-" CFGOPT_PG5_PORT, + .name = "reset-pg5-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPort + 4), }, { @@ -1577,12 +1577,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 4), }, { - .name = CFGOPT_PG6_PORT, + .name = "pg6-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 5), }, { - .name = "reset-" CFGOPT_PG6_PORT, + .name = "reset-pg6-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPort + 5), }, { @@ -1591,12 +1591,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 5), }, { - .name = CFGOPT_PG7_PORT, + .name = "pg7-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 6), }, { - .name = "reset-" CFGOPT_PG7_PORT, + .name = "reset-pg7-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPort + 6), }, { @@ -1605,12 +1605,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 6), }, { - .name = CFGOPT_PG8_PORT, + .name = "pg8-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 7), }, { - .name = "reset-" CFGOPT_PG8_PORT, + .name = "reset-pg8-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgPort + 7), }, { @@ -1622,12 +1622,12 @@ static const struct option optionList[] = // pg-socket-path option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_SOCKET_PATH, + .name = "pg1-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgSocketPath, }, { - .name = "reset-" CFGOPT_PG1_SOCKET_PATH, + .name = "reset-pg1-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgSocketPath, }, { @@ -1641,12 +1641,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgSocketPath, }, { - .name = CFGOPT_PG2_SOCKET_PATH, + .name = "pg2-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 1), }, { - .name = "reset-" CFGOPT_PG2_SOCKET_PATH, + .name = "reset-pg2-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgSocketPath + 1), }, { @@ -1655,12 +1655,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 1), }, { - .name = CFGOPT_PG3_SOCKET_PATH, + .name = "pg3-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 2), }, { - .name = "reset-" CFGOPT_PG3_SOCKET_PATH, + .name = "reset-pg3-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgSocketPath + 2), }, { @@ -1669,12 +1669,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 2), }, { - .name = CFGOPT_PG4_SOCKET_PATH, + .name = "pg4-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 3), }, { - .name = "reset-" CFGOPT_PG4_SOCKET_PATH, + .name = "reset-pg4-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgSocketPath + 3), }, { @@ -1683,12 +1683,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 3), }, { - .name = CFGOPT_PG5_SOCKET_PATH, + .name = "pg5-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 4), }, { - .name = "reset-" CFGOPT_PG5_SOCKET_PATH, + .name = "reset-pg5-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgSocketPath + 4), }, { @@ -1697,12 +1697,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 4), }, { - .name = CFGOPT_PG6_SOCKET_PATH, + .name = "pg6-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 5), }, { - .name = "reset-" CFGOPT_PG6_SOCKET_PATH, + .name = "reset-pg6-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgSocketPath + 5), }, { @@ -1711,12 +1711,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 5), }, { - .name = CFGOPT_PG7_SOCKET_PATH, + .name = "pg7-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 6), }, { - .name = "reset-" CFGOPT_PG7_SOCKET_PATH, + .name = "reset-pg7-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgSocketPath + 6), }, { @@ -1725,12 +1725,12 @@ static const struct option optionList[] = .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 6), }, { - .name = CFGOPT_PG8_SOCKET_PATH, + .name = "pg8-socket-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 7), }, { - .name = "reset-" CFGOPT_PG8_SOCKET_PATH, + .name = "reset-pg8-socket-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgSocketPath + 7), }, { @@ -1742,82 +1742,82 @@ static const struct option optionList[] = // pg-user option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PG1_USER, + .name = "pg1-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptPgUser, }, { - .name = "reset-" CFGOPT_PG1_USER, + .name = "reset-pg1-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptPgUser, }, { - .name = CFGOPT_PG2_USER, + .name = "pg2-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgUser + 1), }, { - .name = "reset-" CFGOPT_PG2_USER, + .name = "reset-pg2-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgUser + 1), }, { - .name = CFGOPT_PG3_USER, + .name = "pg3-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgUser + 2), }, { - .name = "reset-" CFGOPT_PG3_USER, + .name = "reset-pg3-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgUser + 2), }, { - .name = CFGOPT_PG4_USER, + .name = "pg4-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgUser + 3), }, { - .name = "reset-" CFGOPT_PG4_USER, + .name = "reset-pg4-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgUser + 3), }, { - .name = CFGOPT_PG5_USER, + .name = "pg5-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgUser + 4), }, { - .name = "reset-" CFGOPT_PG5_USER, + .name = "reset-pg5-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgUser + 4), }, { - .name = CFGOPT_PG6_USER, + .name = "pg6-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgUser + 5), }, { - .name = "reset-" CFGOPT_PG6_USER, + .name = "reset-pg6-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgUser + 5), }, { - .name = CFGOPT_PG7_USER, + .name = "pg7-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgUser + 6), }, { - .name = "reset-" CFGOPT_PG7_USER, + .name = "reset-pg7-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgUser + 6), }, { - .name = CFGOPT_PG8_USER, + .name = "pg8-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | (cfgOptPgUser + 7), }, { - .name = "reset-" CFGOPT_PG8_USER, + .name = "reset-pg8-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | (cfgOptPgUser + 7), }, // process option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PROCESS, + .name = "process", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptProcess, }, @@ -1825,57 +1825,57 @@ static const struct option optionList[] = // process-max option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PROCESS_MAX, + .name = "process-max", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptProcessMax, }, { - .name = "reset-" CFGOPT_PROCESS_MAX, + .name = "reset-process-max", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptProcessMax, }, // protocol-timeout option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_PROTOCOL_TIMEOUT, + .name = "protocol-timeout", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptProtocolTimeout, }, { - .name = "reset-" CFGOPT_PROTOCOL_TIMEOUT, + .name = "reset-protocol-timeout", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptProtocolTimeout, }, // raw option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_RAW, + .name = "raw", .val = PARSE_OPTION_FLAG | cfgOptRaw, }, // recovery-option option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_RECOVERY_OPTION, + .name = "recovery-option", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRecoveryOption, }, { - .name = "reset-" CFGOPT_RECOVERY_OPTION, + .name = "reset-recovery-option", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRecoveryOption, }, // recurse option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_RECURSE, + .name = "recurse", .val = PARSE_OPTION_FLAG | cfgOptRecurse, }, // remote-type option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REMOTE_TYPE, + .name = "remote-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRemoteType, }, @@ -1883,135 +1883,135 @@ static const struct option optionList[] = // repo-azure-account option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_ACCOUNT, + .name = "repo1-azure-account", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureAccount, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_ACCOUNT, + .name = "reset-repo1-azure-account", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureAccount, }, // repo-azure-ca-file option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_CA_FILE, + .name = "repo1-azure-ca-file", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureCaFile, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_CA_FILE, + .name = "reset-repo1-azure-ca-file", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureCaFile, }, // repo-azure-ca-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_CA_PATH, + .name = "repo1-azure-ca-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureCaPath, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_CA_PATH, + .name = "reset-repo1-azure-ca-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureCaPath, }, // repo-azure-container option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_CONTAINER, + .name = "repo1-azure-container", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureContainer, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_CONTAINER, + .name = "reset-repo1-azure-container", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureContainer, }, // repo-azure-endpoint option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_ENDPOINT, + .name = "repo1-azure-endpoint", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureEndpoint, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_ENDPOINT, + .name = "reset-repo1-azure-endpoint", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureEndpoint, }, // repo-azure-host option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_HOST, + .name = "repo1-azure-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureHost, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_HOST, + .name = "reset-repo1-azure-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureHost, }, // repo-azure-key option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_KEY, + .name = "repo1-azure-key", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureKey, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_KEY, + .name = "reset-repo1-azure-key", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureKey, }, // repo-azure-key-type option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_KEY_TYPE, + .name = "repo1-azure-key-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzureKeyType, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_KEY_TYPE, + .name = "reset-repo1-azure-key-type", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureKeyType, }, // repo-azure-port option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_PORT, + .name = "repo1-azure-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoAzurePort, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_PORT, + .name = "reset-repo1-azure-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzurePort, }, // repo-azure-verify-tls option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_AZURE_VERIFY_TLS, + .name = "repo1-azure-verify-tls", .val = PARSE_OPTION_FLAG | cfgOptRepoAzureVerifyTls, }, { - .name = "no-" CFGOPT_REPO1_AZURE_VERIFY_TLS, + .name = "no-repo1-azure-verify-tls", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoAzureVerifyTls, }, { - .name = "reset-" CFGOPT_REPO1_AZURE_VERIFY_TLS, + .name = "reset-repo1-azure-verify-tls", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoAzureVerifyTls, }, // repo-cipher-pass option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_CIPHER_PASS, + .name = "repo1-cipher-pass", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoCipherPass, }, { - .name = "reset-" CFGOPT_REPO1_CIPHER_PASS, + .name = "reset-repo1-cipher-pass", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoCipherPass, }, { @@ -2023,12 +2023,12 @@ static const struct option optionList[] = // repo-cipher-type option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_CIPHER_TYPE, + .name = "repo1-cipher-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoCipherType, }, { - .name = "reset-" CFGOPT_REPO1_CIPHER_TYPE, + .name = "reset-repo1-cipher-type", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoCipherType, }, { @@ -2040,15 +2040,15 @@ static const struct option optionList[] = // repo-hardlink option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HARDLINK, + .name = "repo1-hardlink", .val = PARSE_OPTION_FLAG | cfgOptRepoHardlink, }, { - .name = "no-" CFGOPT_REPO1_HARDLINK, + .name = "no-repo1-hardlink", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHardlink, }, { - .name = "reset-" CFGOPT_REPO1_HARDLINK, + .name = "reset-repo1-hardlink", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHardlink, }, { @@ -2063,12 +2063,12 @@ static const struct option optionList[] = // repo-host option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HOST, + .name = "repo1-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoHost, }, { - .name = "reset-" CFGOPT_REPO1_HOST, + .name = "reset-repo1-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHost, }, { @@ -2080,12 +2080,12 @@ static const struct option optionList[] = // repo-host-cmd option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HOST_CMD, + .name = "repo1-host-cmd", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoHostCmd, }, { - .name = "reset-" CFGOPT_REPO1_HOST_CMD, + .name = "reset-repo1-host-cmd", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHostCmd, }, { @@ -2097,12 +2097,12 @@ static const struct option optionList[] = // repo-host-config option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HOST_CONFIG, + .name = "repo1-host-config", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoHostConfig, }, { - .name = "reset-" CFGOPT_REPO1_HOST_CONFIG, + .name = "reset-repo1-host-config", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHostConfig, }, { @@ -2114,36 +2114,36 @@ static const struct option optionList[] = // repo-host-config-include-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HOST_CONFIG_INCLUDE_PATH, + .name = "repo1-host-config-include-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoHostConfigIncludePath, }, { - .name = "reset-" CFGOPT_REPO1_HOST_CONFIG_INCLUDE_PATH, + .name = "reset-repo1-host-config-include-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHostConfigIncludePath, }, // repo-host-config-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HOST_CONFIG_PATH, + .name = "repo1-host-config-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoHostConfigPath, }, { - .name = "reset-" CFGOPT_REPO1_HOST_CONFIG_PATH, + .name = "reset-repo1-host-config-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHostConfigPath, }, // repo-host-port option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HOST_PORT, + .name = "repo1-host-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoHostPort, }, { - .name = "reset-" CFGOPT_REPO1_HOST_PORT, + .name = "reset-repo1-host-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHostPort, }, { @@ -2155,12 +2155,12 @@ static const struct option optionList[] = // repo-host-user option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_HOST_USER, + .name = "repo1-host-user", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoHostUser, }, { - .name = "reset-" CFGOPT_REPO1_HOST_USER, + .name = "reset-repo1-host-user", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoHostUser, }, { @@ -2172,27 +2172,27 @@ static const struct option optionList[] = // repo-local option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_LOCAL, + .name = "repo1-local", .val = PARSE_OPTION_FLAG | cfgOptRepoLocal, }, { - .name = "no-" CFGOPT_REPO1_LOCAL, + .name = "no-repo1-local", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoLocal, }, { - .name = "reset-" CFGOPT_REPO1_LOCAL, + .name = "reset-repo1-local", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoLocal, }, // repo-path option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_PATH, + .name = "repo1-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoPath, }, { - .name = "reset-" CFGOPT_REPO1_PATH, + .name = "reset-repo1-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoPath, }, { @@ -2204,12 +2204,12 @@ static const struct option optionList[] = // repo-retention-archive option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_RETENTION_ARCHIVE, + .name = "repo1-retention-archive", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoRetentionArchive, }, { - .name = "reset-" CFGOPT_REPO1_RETENTION_ARCHIVE, + .name = "reset-repo1-retention-archive", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoRetentionArchive, }, { @@ -2221,12 +2221,12 @@ static const struct option optionList[] = // repo-retention-archive-type option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE, + .name = "repo1-retention-archive-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoRetentionArchiveType, }, { - .name = "reset-" CFGOPT_REPO1_RETENTION_ARCHIVE_TYPE, + .name = "reset-repo1-retention-archive-type", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoRetentionArchiveType, }, { @@ -2238,12 +2238,12 @@ static const struct option optionList[] = // repo-retention-diff option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_RETENTION_DIFF, + .name = "repo1-retention-diff", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoRetentionDiff, }, { - .name = "reset-" CFGOPT_REPO1_RETENTION_DIFF, + .name = "reset-repo1-retention-diff", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoRetentionDiff, }, { @@ -2255,12 +2255,12 @@ static const struct option optionList[] = // repo-retention-full option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_RETENTION_FULL, + .name = "repo1-retention-full", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoRetentionFull, }, { - .name = "reset-" CFGOPT_REPO1_RETENTION_FULL, + .name = "reset-repo1-retention-full", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoRetentionFull, }, { @@ -2272,24 +2272,24 @@ static const struct option optionList[] = // repo-retention-full-type option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_RETENTION_FULL_TYPE, + .name = "repo1-retention-full-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoRetentionFullType, }, { - .name = "reset-" CFGOPT_REPO1_RETENTION_FULL_TYPE, + .name = "reset-repo1-retention-full-type", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoRetentionFullType, }, // repo-s3-bucket option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_BUCKET, + .name = "repo1-s3-bucket", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Bucket, }, { - .name = "reset-" CFGOPT_REPO1_S3_BUCKET, + .name = "reset-repo1-s3-bucket", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Bucket, }, { @@ -2301,12 +2301,12 @@ static const struct option optionList[] = // repo-s3-ca-file option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_CA_FILE, + .name = "repo1-s3-ca-file", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3CaFile, }, { - .name = "reset-" CFGOPT_REPO1_S3_CA_FILE, + .name = "reset-repo1-s3-ca-file", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3CaFile, }, { @@ -2318,12 +2318,12 @@ static const struct option optionList[] = // repo-s3-ca-path option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_CA_PATH, + .name = "repo1-s3-ca-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3CaPath, }, { - .name = "reset-" CFGOPT_REPO1_S3_CA_PATH, + .name = "reset-repo1-s3-ca-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3CaPath, }, { @@ -2335,12 +2335,12 @@ static const struct option optionList[] = // repo-s3-endpoint option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_ENDPOINT, + .name = "repo1-s3-endpoint", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Endpoint, }, { - .name = "reset-" CFGOPT_REPO1_S3_ENDPOINT, + .name = "reset-repo1-s3-endpoint", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Endpoint, }, { @@ -2352,12 +2352,12 @@ static const struct option optionList[] = // repo-s3-host option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_HOST, + .name = "repo1-s3-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Host, }, { - .name = "reset-" CFGOPT_REPO1_S3_HOST, + .name = "reset-repo1-s3-host", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Host, }, { @@ -2369,12 +2369,12 @@ static const struct option optionList[] = // repo-s3-key option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_KEY, + .name = "repo1-s3-key", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Key, }, { - .name = "reset-" CFGOPT_REPO1_S3_KEY, + .name = "reset-repo1-s3-key", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Key, }, { @@ -2386,12 +2386,12 @@ static const struct option optionList[] = // repo-s3-key-secret option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_KEY_SECRET, + .name = "repo1-s3-key-secret", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3KeySecret, }, { - .name = "reset-" CFGOPT_REPO1_S3_KEY_SECRET, + .name = "reset-repo1-s3-key-secret", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3KeySecret, }, { @@ -2403,36 +2403,36 @@ static const struct option optionList[] = // repo-s3-key-type option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_KEY_TYPE, + .name = "repo1-s3-key-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3KeyType, }, { - .name = "reset-" CFGOPT_REPO1_S3_KEY_TYPE, + .name = "reset-repo1-s3-key-type", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3KeyType, }, // repo-s3-port option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_PORT, + .name = "repo1-s3-port", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Port, }, { - .name = "reset-" CFGOPT_REPO1_S3_PORT, + .name = "reset-repo1-s3-port", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Port, }, // repo-s3-region option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_REGION, + .name = "repo1-s3-region", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Region, }, { - .name = "reset-" CFGOPT_REPO1_S3_REGION, + .name = "reset-repo1-s3-region", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Region, }, { @@ -2444,51 +2444,51 @@ static const struct option optionList[] = // repo-s3-role option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_ROLE, + .name = "repo1-s3-role", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Role, }, { - .name = "reset-" CFGOPT_REPO1_S3_ROLE, + .name = "reset-repo1-s3-role", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Role, }, // repo-s3-token option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_TOKEN, + .name = "repo1-s3-token", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Token, }, { - .name = "reset-" CFGOPT_REPO1_S3_TOKEN, + .name = "reset-repo1-s3-token", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3Token, }, // repo-s3-uri-style option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_URI_STYLE, + .name = "repo1-s3-uri-style", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3UriStyle, }, { - .name = "reset-" CFGOPT_REPO1_S3_URI_STYLE, + .name = "reset-repo1-s3-uri-style", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3UriStyle, }, // repo-s3-verify-tls option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_S3_VERIFY_TLS, + .name = "repo1-s3-verify-tls", .val = PARSE_OPTION_FLAG | cfgOptRepoS3VerifyTls, }, { - .name = "no-" CFGOPT_REPO1_S3_VERIFY_TLS, + .name = "no-repo1-s3-verify-tls", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3VerifyTls, }, { - .name = "reset-" CFGOPT_REPO1_S3_VERIFY_TLS, + .name = "reset-repo1-s3-verify-tls", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoS3VerifyTls, }, { @@ -2511,12 +2511,12 @@ static const struct option optionList[] = // repo-type option and deprecations // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_REPO1_TYPE, + .name = "repo1-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoType, }, { - .name = "reset-" CFGOPT_REPO1_TYPE, + .name = "reset-repo1-type", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptRepoType, }, { @@ -2528,52 +2528,52 @@ static const struct option optionList[] = // resume option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_RESUME, + .name = "resume", .val = PARSE_OPTION_FLAG | cfgOptResume, }, { - .name = "no-" CFGOPT_RESUME, + .name = "no-resume", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptResume, }, { - .name = "reset-" CFGOPT_RESUME, + .name = "reset-resume", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptResume, }, // sck-block option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_SCK_BLOCK, + .name = "sck-block", .val = PARSE_OPTION_FLAG | cfgOptSckBlock, }, { - .name = "no-" CFGOPT_SCK_BLOCK, + .name = "no-sck-block", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptSckBlock, }, { - .name = "reset-" CFGOPT_SCK_BLOCK, + .name = "reset-sck-block", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptSckBlock, }, // sck-keep-alive option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_SCK_KEEP_ALIVE, + .name = "sck-keep-alive", .val = PARSE_OPTION_FLAG | cfgOptSckKeepAlive, }, { - .name = "no-" CFGOPT_SCK_KEEP_ALIVE, + .name = "no-sck-keep-alive", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptSckKeepAlive, }, { - .name = "reset-" CFGOPT_SCK_KEEP_ALIVE, + .name = "reset-sck-keep-alive", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptSckKeepAlive, }, // set option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_SET, + .name = "set", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptSet, }, @@ -2581,7 +2581,7 @@ static const struct option optionList[] = // sort option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_SORT, + .name = "sort", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptSort, }, @@ -2589,19 +2589,19 @@ static const struct option optionList[] = // spool-path option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_SPOOL_PATH, + .name = "spool-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptSpoolPath, }, { - .name = "reset-" CFGOPT_SPOOL_PATH, + .name = "reset-spool-path", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptSpoolPath, }, // stanza option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_STANZA, + .name = "stanza", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptStanza, }, @@ -2609,61 +2609,61 @@ static const struct option optionList[] = // start-fast option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_START_FAST, + .name = "start-fast", .val = PARSE_OPTION_FLAG | cfgOptStartFast, }, { - .name = "no-" CFGOPT_START_FAST, + .name = "no-start-fast", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptStartFast, }, { - .name = "reset-" CFGOPT_START_FAST, + .name = "reset-start-fast", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptStartFast, }, // stop-auto option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_STOP_AUTO, + .name = "stop-auto", .val = PARSE_OPTION_FLAG | cfgOptStopAuto, }, { - .name = "no-" CFGOPT_STOP_AUTO, + .name = "no-stop-auto", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptStopAuto, }, { - .name = "reset-" CFGOPT_STOP_AUTO, + .name = "reset-stop-auto", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptStopAuto, }, // tablespace-map option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TABLESPACE_MAP, + .name = "tablespace-map", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTablespaceMap, }, { - .name = "reset-" CFGOPT_TABLESPACE_MAP, + .name = "reset-tablespace-map", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptTablespaceMap, }, // tablespace-map-all option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TABLESPACE_MAP_ALL, + .name = "tablespace-map-all", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTablespaceMapAll, }, { - .name = "reset-" CFGOPT_TABLESPACE_MAP_ALL, + .name = "reset-tablespace-map-all", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptTablespaceMapAll, }, // target option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TARGET, + .name = "target", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTarget, }, @@ -2671,7 +2671,7 @@ static const struct option optionList[] = // target-action option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TARGET_ACTION, + .name = "target-action", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTargetAction, }, @@ -2679,14 +2679,14 @@ static const struct option optionList[] = // target-exclusive option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TARGET_EXCLUSIVE, + .name = "target-exclusive", .val = PARSE_OPTION_FLAG | cfgOptTargetExclusive, }, // target-timeline option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TARGET_TIMELINE, + .name = "target-timeline", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTargetTimeline, }, @@ -2694,43 +2694,43 @@ static const struct option optionList[] = // tcp-keep-alive-count option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TCP_KEEP_ALIVE_COUNT, + .name = "tcp-keep-alive-count", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTcpKeepAliveCount, }, { - .name = "reset-" CFGOPT_TCP_KEEP_ALIVE_COUNT, + .name = "reset-tcp-keep-alive-count", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptTcpKeepAliveCount, }, // tcp-keep-alive-idle option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TCP_KEEP_ALIVE_IDLE, + .name = "tcp-keep-alive-idle", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTcpKeepAliveIdle, }, { - .name = "reset-" CFGOPT_TCP_KEEP_ALIVE_IDLE, + .name = "reset-tcp-keep-alive-idle", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptTcpKeepAliveIdle, }, // tcp-keep-alive-interval option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TCP_KEEP_ALIVE_INTERVAL, + .name = "tcp-keep-alive-interval", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTcpKeepAliveInterval, }, { - .name = "reset-" CFGOPT_TCP_KEEP_ALIVE_INTERVAL, + .name = "reset-tcp-keep-alive-interval", .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptTcpKeepAliveInterval, }, // type option // ----------------------------------------------------------------------------------------------------------------------------- { - .name = CFGOPT_TYPE, + .name = "type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptType, }, diff --git a/src/protocol/helper.c b/src/protocol/helper.c index b20821207..2bb1bc25b 100644 --- a/src/protocol/helper.c +++ b/src/protocol/helper.c @@ -341,7 +341,8 @@ protocolRemoteParam(ProtocolStorageType protocolStorageType, unsigned int protoc // Set local so host settings configured on the remote will not accidentally be picked up kvPut( optionReplace, - protocolStorageType == protocolStorageTypeRepo ? VARSTR(CFGOPT_REPO1_LOCAL_STR) : VARSTR(CFGOPT_PG1_LOCAL_STR), + protocolStorageType == protocolStorageTypeRepo ? + VARSTRZ(cfgOptionName(cfgOptRepoLocal)) : VARSTRZ(cfgOptionName(cfgOptPgLocal)), BOOL_TRUE_VAR); // Update/remove repo/pg options that are sent to the remote @@ -523,8 +524,8 @@ protocolRemoteGet(ProtocolStorageType protocolStorageType, unsigned int hostId) { // Options to query VariantList *param = varLstNew(); - varLstAdd(param, varNewStr(CFGOPT_REPO1_CIPHER_TYPE_STR)); - varLstAdd(param, varNewStr(CFGOPT_REPO1_CIPHER_PASS_STR)); + varLstAdd(param, varNewStrZ(cfgOptionName(cfgOptRepoCipherType))); + varLstAdd(param, varNewStrZ(cfgOptionName(cfgOptRepoCipherPass))); VariantList *optionList = configProtocolOption(protocolHelperClient->client, param); diff --git a/test/src/common/harnessConfig.c b/test/src/common/harnessConfig.c index 1af46f052..19446a799 100644 --- a/test/src/common/harnessConfig.c +++ b/test/src/common/harnessConfig.c @@ -1,6 +1,11 @@ /*********************************************************************************************************************************** Harness for Loading Test Configurations ***********************************************************************************************************************************/ +#include +#include +#include + +#include "common/harnessConfig.h" #include "common/harnessDebug.h" #include "common/harnessLog.h" #include "common/harnessTest.h" @@ -79,3 +84,115 @@ harnessCfgLoad(ConfigCommand commandId, const StringList *argListParam) FUNCTION_HARNESS_RESULT_VOID(); } + +/**********************************************************************************************************************************/ +void +hrnCfgArgRaw(StringList *argList, ConfigOption optionId, const String *value) +{ + hrnCfgArgKeyRawZ(argList, optionId, 1, strZ(value)); +} + +void +hrnCfgArgKeyRaw(StringList *argList, ConfigOption optionId, unsigned optionKey, const String *value) +{ + hrnCfgArgKeyRawZ(argList, optionId, optionKey, strZ(value)); +} + +void +hrnCfgArgRawFmt(StringList *argList, ConfigOption optionId, const char *format, ...) +{ + char buffer[256]; + + va_list argument; + va_start(argument, format); + (size_t)vsnprintf(buffer, sizeof(buffer) - 1, format, argument); + va_end(argument); + + hrnCfgArgKeyRawZ(argList, optionId, 1, buffer); +} + +void +hrnCfgArgKeyRawFmt(StringList *argList, ConfigOption optionId, unsigned optionKey, const char *format, ...) +{ + char buffer[256]; + + va_list argument; + va_start(argument, format); + (size_t)vsnprintf(buffer, sizeof(buffer) - 1, format, argument); + va_end(argument); + + hrnCfgArgKeyRawZ(argList, optionId, optionKey, buffer); +} + +void +hrnCfgArgRawZ(StringList *argList, ConfigOption optionId, const char *value) +{ + hrnCfgArgKeyRawZ(argList, optionId, 1, value); +} + +void +hrnCfgArgKeyRawZ(StringList *argList, ConfigOption optionId, unsigned optionKey, const char *value) +{ + strLstAdd(argList, strNewFmt("--%s=%s", cfgOptionName(optionId + optionKey - 1), value)); +} + +void +hrnCfgArgRawBool(StringList *argList, ConfigOption optionId, bool value) +{ + hrnCfgArgKeyRawBool(argList, optionId, 1, value); +} + +void +hrnCfgArgKeyRawBool(StringList *argList, ConfigOption optionId, unsigned optionKey, bool value) +{ + strLstAdd(argList, strNewFmt("--%s%s", value ? "" : "no-", cfgOptionName(optionId + optionKey - 1))); +} + +void +hrnCfgArgRawReset(StringList *argList, ConfigOption optionId) +{ + hrnCfgArgKeyRawReset(argList, optionId, 1); +} + +void +hrnCfgArgKeyRawReset(StringList *argList, ConfigOption optionId, unsigned optionKey) +{ + strLstAdd(argList, strNewFmt("--reset-%s", cfgOptionName(optionId + optionKey - 1))); +} + +/**********************************************************************************************************************************/ +void +hrnCfgEnvRaw(ConfigOption optionId, const String *value) +{ + hrnCfgEnvIdRawZ(optionId, 1, strZ(value)); +} + +void +hrnCfgEnvIdRaw(ConfigOption optionId, unsigned optionKey, const String *value) +{ + hrnCfgEnvIdRawZ(optionId, optionKey, strZ(value)); +} + +void +hrnCfgEnvRawZ(ConfigOption optionId, const char *value) +{ + hrnCfgEnvIdRawZ(optionId, 1, value); +} + +void +hrnCfgEnvIdRawZ(ConfigOption optionId, unsigned optionKey, const char *value) +{ + setenv(strZ(strNewFmt(HRN_PGBACKREST_ENV "%s", cfgOptionName(optionId + optionKey - 1))), value, true); +} + +void +hrnCfgEnvRemoveRaw(ConfigOption optionId) +{ + hrnCfgEnvIdRemoveRaw(optionId, 1); +} + +void +hrnCfgEnvIdRemoveRaw(ConfigOption optionId, unsigned optionKey) +{ + unsetenv(strZ(strNewFmt(HRN_PGBACKREST_ENV "%s", cfgOptionName(optionId + optionKey - 1)))); +} diff --git a/test/src/common/harnessConfig.h b/test/src/common/harnessConfig.h index 30fb5f0dd..24443e1f0 100644 --- a/test/src/common/harnessConfig.h +++ b/test/src/common/harnessConfig.h @@ -3,6 +3,11 @@ Harness for Loading Test Configurations ***********************************************************************************************************************************/ #include "config/config.h" +/*********************************************************************************************************************************** +Prefix for environment variables +***********************************************************************************************************************************/ +#define HRN_PGBACKREST_ENV "PGBACKREST_" + /*********************************************************************************************************************************** Load a test configuration without any side effects @@ -14,3 +19,41 @@ void harnessCfgLoadRaw(unsigned int argListSize, const char *argList[]); // Automatically adds the exe, command (and role), lock-path, and log-path so executing the binary works locally or in a container. void harnessCfgLoad(ConfigCommand commandId, const StringList *argList); void harnessCfgLoadRole(ConfigCommand commandId, ConfigCommandRole commandRoleId, const StringList *argList); + +/*********************************************************************************************************************************** +Configuration helper functions + +These functions set options in the argument list using the option IDs rather than string constants. Each function has a "Key" +variant that works with indexed options and allows the key to be specified, e.g. hrnCfgArgKeyRawZ(cfgOptPgpath, 3, "/pg") will add +--pg3-path=/pg to the argument list. +***********************************************************************************************************************************/ +void hrnCfgArgRaw(StringList *argList, ConfigOption optionId, const String *value); +void hrnCfgArgKeyRaw(StringList *argList, ConfigOption optionId, unsigned optionKey, const String *value); + +void hrnCfgArgRawFmt(StringList *argList, ConfigOption optionId, const char *format, ...) + __attribute__((format(printf, 3, 4))); +void hrnCfgArgKeyRawFmt(StringList *argList, ConfigOption optionId, unsigned optionKey, const char *format, ...) + __attribute__((format(printf, 4, 5))); + +void hrnCfgArgRawZ(StringList *argList, ConfigOption optionId, const char *value); +void hrnCfgArgKeyRawZ(StringList *argList, ConfigOption optionId, unsigned optionKey, const char *value); + +void hrnCfgArgRawBool(StringList *argList, ConfigOption optionId, bool value); +void hrnCfgArgKeyRawBool(StringList *argList, ConfigOption optionId, unsigned optionKey, bool value); + +void hrnCfgArgRawReset(StringList *argList, ConfigOption optionId); +void hrnCfgArgKeyRawReset(StringList *argList, ConfigOption optionId, unsigned optionKey); + +/*********************************************************************************************************************************** +Environment helper functions + +Add and remove environment options, which are required to pass secrets, e.g. repo1-cipher-pass. +***********************************************************************************************************************************/ +void hrnCfgEnvRaw(ConfigOption optionId, const String *value); +void hrnCfgEnvIdRaw(ConfigOption optionId, unsigned optionKey, const String *value); + +void hrnCfgEnvRawZ(ConfigOption optionId, const char *value); +void hrnCfgEnvIdRawZ(ConfigOption optionId, unsigned optionKey, const char *value); + +void hrnCfgEnvRemoveRaw(ConfigOption optionId); +void hrnCfgEnvIdRemoveRaw(ConfigOption optionId, unsigned optionKey); diff --git a/test/src/module/command/archiveCommonTest.c b/test/src/module/command/archiveCommonTest.c index 44eeb0bdd..339b5647a 100644 --- a/test/src/module/command/archiveCommonTest.c +++ b/test/src/module/command/archiveCommonTest.c @@ -125,7 +125,7 @@ testRun(void) StringList *argList = strLstNew(); strLstAdd(argList, strNewFmt("--spool-path=%s", testPath())); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--" CFGOPT_ARCHIVE_ASYNC); harnessCfgLoadRole(cfgCmdArchiveGet, cfgCmdRoleAsync, argList); @@ -226,7 +226,7 @@ testRun(void) // Load configuration to set repo-path and stanza StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNewFmt("--repo-path=%s", testPath())); strLstAddZ(argList, "archive-get"); harnessCfgLoad(cfgCmdArchiveGet, argList); diff --git a/test/src/module/command/archiveGetTest.c b/test/src/module/command/archiveGetTest.c index 8b8dba825..dfc2c68f5 100644 --- a/test/src/module/command/archiveGetTest.c +++ b/test/src/module/command/archiveGetTest.c @@ -249,7 +249,7 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=test1"); strLstAddZ(argList, "--archive-async"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/unused"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/unused"); strLstAdd(argList, strNewFmt("--spool-path=%s/spool", testPath())); harnessCfgLoad(cfgCmdArchiveGet, argList); @@ -334,9 +334,9 @@ testRun(void) TEST_TITLE("command must be run on the pg host"); StringList *argList = strLstNew(); - strLstAddZ(argList, "--" CFGOPT_PG1_HOST "=host"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/pg"); - strLstAddZ(argList, "--" CFGOPT_REPO1_PATH "=/repo"); + hrnCfgArgRawZ(argList, cfgOptPgHost, "host"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/pg"); + hrnCfgArgRawZ(argList, cfgOptRepoPath, "/repo"); strLstAddZ(argList, "--" CFGOPT_SPOOL_PATH "=/spool"); strLstAddZ(argList, "--" CFGOPT_ARCHIVE_ASYNC); strLstAddZ(argList, "--" CFGOPT_STANZA "=test2"); @@ -502,9 +502,9 @@ testRun(void) TEST_TITLE("command must be run on the pg host"); StringList *argList = strLstNew(); - strLstAddZ(argList, "--" CFGOPT_PG1_HOST "=host"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/pg"); - strLstAddZ(argList, "--" CFGOPT_REPO1_PATH "=/repo"); + hrnCfgArgRawZ(argList, cfgOptPgHost, "host"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/pg"); + hrnCfgArgRawZ(argList, cfgOptRepoPath, "/repo"); strLstAddZ(argList, "--" CFGOPT_STANZA "=test2"); strLstAddZ(argList, "000000010000000100000001"); strLstAddZ(argList, "pg_wal/000000010000000100000001"); @@ -520,7 +520,7 @@ testRun(void) strLstAdd(argList, strNewFmt("--log-path=%s", testPath())); strLstAdd(argList, strNewFmt("--log-level-file=debug")); strLstAdd(argList, strNewFmt("--repo1-path=%s/repo", testPath())); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s/db", testPath())); + hrnCfgArgRawFmt(argList, cfgOptPgPath, "%s/db", testPath()); strLstAddZ(argList, "--stanza=test1"); strLstAddZ(argList, "archive-get"); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); diff --git a/test/src/module/command/archivePushTest.c b/test/src/module/command/archivePushTest.c index 69fdae222..76192f638 100644 --- a/test/src/module/command/archivePushTest.c +++ b/test/src/module/command/archivePushTest.c @@ -177,8 +177,8 @@ testRun(void) TEST_TITLE("command must be run on the pg host"); StringList *argList = strLstNew(); - strLstAddZ(argList, "--" CFGOPT_PG1_HOST "=host"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/pg"); + hrnCfgArgRawZ(argList, cfgOptPgHost, "host"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/pg"); strLstAddZ(argList, "--" CFGOPT_STANZA "=test2"); harnessCfgLoadRole(cfgCmdArchivePush, cfgCmdRoleDefault, argList); @@ -299,7 +299,7 @@ testRun(void) argListTemp = strLstNew(); strLstAddZ(argListTemp, "--" CFGOPT_STANZA "=test"); - strLstAdd(argListTemp, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); + hrnCfgArgRawFmt(argListTemp, cfgOptRepoPath, "%s/repo", testPath()); strLstAdd(argListTemp, strNewFmt("%s/pg/pg_wal/000000010000000100000002", testPath())); harnessCfgLoad(cfgCmdArchivePush, argListTemp); @@ -442,8 +442,8 @@ testRun(void) TEST_TITLE("command must be run on the pg host"); StringList *argList = strLstNew(); - strLstAddZ(argList, "--" CFGOPT_PG1_HOST "=host"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/pg"); + hrnCfgArgRawZ(argList, cfgOptPgHost, "host"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/pg"); strLstAddZ(argList, "--" CFGOPT_SPOOL_PATH "=/spool"); strLstAddZ(argList, "--" CFGOPT_STANZA "=test2"); strLstAddZ(argList, "--" CFGOPT_ARCHIVE_ASYNC); diff --git a/test/src/module/command/backupTest.c b/test/src/module/command/backupTest.c index d2705a5ba..9c4a5b2f5 100644 --- a/test/src/module/command/backupTest.c +++ b/test/src/module/command/backupTest.c @@ -929,9 +929,9 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); harnessCfgLoad(cfgCmdBackup, argList); time_t timestamp = 1575401652; @@ -1009,9 +1009,9 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_BACKUP_STANDBY); harnessCfgLoad(cfgCmdBackup, argList); @@ -1029,9 +1029,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_BACKUP_STANDBY); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); harnessCfgLoad(cfgCmdBackup, argList); @@ -1054,9 +1054,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); harnessCfgLoad(cfgCmdBackup, argList); @@ -1081,9 +1081,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); strLstAddZ(argList, "--" CFGOPT_START_FAST); harnessCfgLoad(cfgCmdBackup, argList); @@ -1105,9 +1105,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); strLstAddZ(argList, "--" CFGOPT_STOP_AUTO); harnessCfgLoad(cfgCmdBackup, argList); @@ -1129,9 +1129,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_CHECKSUM_PAGE); harnessCfgLoad(cfgCmdBackup, argList); @@ -1161,9 +1161,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_CHECKSUM_PAGE); harnessCfgLoad(cfgCmdBackup, argList); @@ -1210,9 +1210,9 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); harnessCfgLoad(cfgCmdBackup, argList); // Create pg_control @@ -1246,9 +1246,9 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/pg"); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/pg"); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_FULL); strLstAddZ(argList, "--no-" CFGOPT_COMPRESS); harnessCfgLoad(cfgCmdBackup, argList); @@ -1445,8 +1445,8 @@ testRun(void) // Create stanza StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); harnessCfgLoad(cfgCmdStanzaCreate, argList); @@ -1457,9 +1457,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); harnessCfgLoad(cfgCmdBackup, argList); @@ -1477,9 +1477,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); strLstAddZ(argList, "--no-" CFGOPT_COMPRESS); strLstAddZ(argList, "--" CFGOPT_FORCE); @@ -1509,12 +1509,12 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); strLstAddZ(argList, "--" CFGOPT_COMPRESS); - strLstAddZ(argList, "--" CFGOPT_REPO1_HARDLINK); + hrnCfgArgRawBool(argList, cfgOptRepoHardlink, true); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_DIFF); harnessCfgLoad(cfgCmdBackup, argList); @@ -1530,9 +1530,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); strLstAddZ(argList, "--no-" CFGOPT_COMPRESS); strLstAddZ(argList, "--" CFGOPT_CHECKSUM_PAGE); @@ -1558,9 +1558,9 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); strLstAddZ(argList, "--no-" CFGOPT_COMPRESS); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_DIFF); @@ -1620,8 +1620,8 @@ testRun(void) // Create stanza StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); harnessCfgLoad(cfgCmdStanzaCreate, argList); @@ -1630,9 +1630,9 @@ testRun(void) // Load options argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_FULL); strLstAddZ(argList, "--" CFGOPT_STOP_AUTO); strLstAddZ(argList, "--no-" CFGOPT_COMPRESS); @@ -1727,12 +1727,12 @@ testRun(void) // Load options StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_FULL); strLstAddZ(argList, "--" CFGOPT_STOP_AUTO); - strLstAddZ(argList, "--" CFGOPT_REPO1_HARDLINK); + hrnCfgArgRawBool(argList, cfgOptRepoHardlink, true); strLstAddZ(argList, "--" CFGOPT_ARCHIVE_COPY); harnessCfgLoad(cfgCmdBackup, argList); @@ -1915,13 +1915,13 @@ testRun(void) { StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_DIFF); strLstAddZ(argList, "--no-" CFGOPT_COMPRESS); strLstAddZ(argList, "--" CFGOPT_STOP_AUTO); - strLstAddZ(argList, "--" CFGOPT_REPO1_HARDLINK); + hrnCfgArgRawBool(argList, cfgOptRepoHardlink, true); harnessCfgLoad(cfgCmdBackup, argList); // Load the previous manifest and null out the checksum-page option to be sure it gets set to false in this backup @@ -2084,8 +2084,8 @@ testRun(void) // Upgrade stanza StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); harnessCfgLoad(cfgCmdStanzaUpgrade, argList); @@ -2094,11 +2094,11 @@ testRun(void) // Load options argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG2_PATH "=%s", strZ(pg2Path))); - strLstAddZ(argList, "--" CFGOPT_PG2_PORT "=5433"); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgKeyRaw(argList, cfgOptPgPath, 1, pg1Path); + hrnCfgArgKeyRaw(argList, cfgOptPgPath, 2, pg2Path); + hrnCfgArgKeyRawZ(argList, cfgOptPgPort, 2, "5433"); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--no-" CFGOPT_COMPRESS); strLstAddZ(argList, "--" CFGOPT_BACKUP_STANDBY); strLstAddZ(argList, "--" CFGOPT_START_FAST); @@ -2232,8 +2232,8 @@ testRun(void) // Upgrade stanza StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); strLstAddZ(argList, "--no-" CFGOPT_ONLINE); harnessCfgLoad(cfgCmdStanzaUpgrade, argList); @@ -2242,11 +2242,11 @@ testRun(void) // Load options argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_FULL); - strLstAddZ(argList, "--" CFGOPT_REPO1_HARDLINK); + hrnCfgArgRawBool(argList, cfgOptRepoHardlink, true); strLstAddZ(argList, "--" CFGOPT_MANIFEST_SAVE_THRESHOLD "=1"); strLstAddZ(argList, "--" CFGOPT_ARCHIVE_COPY); harnessCfgLoad(cfgCmdBackup, argList); @@ -2428,11 +2428,11 @@ testRun(void) // Load options StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_INCR); - strLstAddZ(argList, "--" CFGOPT_REPO1_HARDLINK); + hrnCfgArgRawBool(argList, cfgOptRepoHardlink, true); harnessCfgLoad(cfgCmdBackup, argList); // Run backup @@ -2462,12 +2462,12 @@ testRun(void) // Load options StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pg1Path))); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pg1Path); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, "--" CFGOPT_TYPE "=" BACKUP_TYPE_INCR); strLstAddZ(argList, "--" CFGOPT_DELTA); - strLstAddZ(argList, "--" CFGOPT_REPO1_HARDLINK); + hrnCfgArgRawBool(argList, cfgOptRepoHardlink, true); harnessCfgLoad(cfgCmdBackup, argList); // Update pg_control timestamp diff --git a/test/src/module/command/checkTest.c b/test/src/module/command/checkTest.c index c0eb0eebc..d489a86cc 100644 --- a/test/src/module/command/checkTest.c +++ b/test/src/module/command/checkTest.c @@ -317,8 +317,8 @@ testRun(void) argList = strLstNew(); strLstAdd(argList, stanzaOpt); strLstAdd(argList, pg1PathOpt); - strLstAddZ(argList, "--pg5-host=localhost"); - strLstAddZ(argList, "--" CFGOPT_PG5_HOST_CMD "=pgbackrest-bogus"); + hrnCfgArgKeyRawZ(argList, cfgOptPgHost, 5, "localhost"); + hrnCfgArgKeyRawZ(argList, cfgOptPgHostCmd, 5, "pgbackrest-bogus"); strLstAddZ(argList, "--pg5-path=/path/to/pg5"); strLstAdd(argList, strNewFmt("--pg5-host-user=%s", testUser())); harnessCfgLoad(cfgCmdCheck, argList); diff --git a/test/src/module/command/controlTest.c b/test/src/module/command/controlTest.c index 4946c3c17..b2ddbb495 100644 --- a/test/src/module/command/controlTest.c +++ b/test/src/module/command/controlTest.c @@ -24,7 +24,7 @@ testRun(void) // Load configuration so lock path is set StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); harnessCfgLoad(cfgCmdArchiveGet, argList); TEST_RESULT_STR_Z( diff --git a/test/src/module/command/localTest.c b/test/src/module/command/localTest.c index 25e0e6ede..558d622e2 100644 --- a/test/src/module/command/localTest.c +++ b/test/src/module/command/localTest.c @@ -32,7 +32,7 @@ testRun(void) { StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--process=1"); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_REPO); strLstAddZ(argList, "--host-id=1"); diff --git a/test/src/module/command/remoteTest.c b/test/src/module/command/remoteTest.c index fa4847c20..1b931746e 100644 --- a/test/src/module/command/remoteTest.c +++ b/test/src/module/command/remoteTest.c @@ -69,7 +69,7 @@ testRun(void) strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_REPO); strLstAddZ(argList, "--lock-path=/bogus"); strLstAddZ(argList, "--" CFGOPT_STANZA "=test"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, CFGCMD_ARCHIVE_GET ":" CONFIG_COMMAND_ROLE_REMOTE); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); diff --git a/test/src/module/command/repoTest.c b/test/src/module/command/repoTest.c index 43154f3c2..72a24c7c7 100644 --- a/test/src/module/command/repoTest.c +++ b/test/src/module/command/repoTest.c @@ -296,7 +296,7 @@ testRun(void) TEST_TITLE("error when missing destination"); StringList *argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); harnessCfgLoad(cfgCmdRepoPut, argList); TEST_ERROR(storagePutProcess(ioBufferReadNew(fileBuffer)), ParamRequiredError, "destination file required"); @@ -313,8 +313,8 @@ testRun(void) TEST_TITLE("put an encrypted file with custom key"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--" CFGOPT_CIPHER_PASS "=custom"); strLstAdd(argList, fileEncCustomName); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -325,8 +325,8 @@ testRun(void) TEST_TITLE("put a raw file"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--raw"); strLstAdd(argList, fileRawName); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -347,8 +347,8 @@ testRun(void) TEST_TITLE("put encrypted archive.info"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_ARCHIVE "/test/" INFO_ARCHIVE_FILE); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -358,8 +358,8 @@ testRun(void) TEST_TITLE("put encrypted archive.info.copy"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_ARCHIVE "/test/" INFO_ARCHIVE_FILE ".copy"); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -369,8 +369,8 @@ testRun(void) TEST_TITLE("put encrypted backup.info"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/" INFO_BACKUP_FILE); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -380,8 +380,8 @@ testRun(void) TEST_TITLE("put encrypted backup.info.copy"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/" INFO_BACKUP_FILE ".copy"); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -397,8 +397,8 @@ testRun(void) bufUsedSet(archiveFileBuffer, bufSize(archiveFileBuffer)); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--" CFGOPT_CIPHER_PASS "=custom"); strLstAdd(argList, strNew(STORAGE_PATH_ARCHIVE "/test/12-1/000000010000000100000001-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -412,8 +412,8 @@ testRun(void) TEST_TITLE("put encrypted backup.manifest"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--" CFGOPT_CIPHER_PASS "=custom"); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/latest/" BACKUP_MANIFEST_FILE); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -424,8 +424,8 @@ testRun(void) TEST_TITLE("put encrypted backup.manifest.copy"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--" CFGOPT_CIPHER_PASS "=custom"); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/latest/" BACKUP_MANIFEST_FILE ".copy"); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -436,8 +436,8 @@ testRun(void) TEST_TITLE("put encrypted backup.history manifest"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--" CFGOPT_CIPHER_PASS "=custom"); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/backup.history/2020/label.manifest.gz"); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -448,8 +448,8 @@ testRun(void) TEST_TITLE("put encrypted backup_label"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--" CFGOPT_CIPHER_PASS "=custom2"); strLstAdd(argList, strNew(STORAGE_PATH_BACKUP "/test/latest/pg_data/backup_label")); harnessCfgLoad(cfgCmdRepoPut, argList); @@ -460,7 +460,7 @@ testRun(void) TEST_TITLE("error when missing source"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); harnessCfgLoad(cfgCmdRepoGet, argList); TEST_ERROR(storageGetProcess(ioBufferWriteNew(bufNew(0))), ParamRequiredError, "source file required"); @@ -479,7 +479,7 @@ testRun(void) TEST_TITLE("get a file with / repo"); argList = strLstNew(); - strLstAdd(argList, strNew("--" CFGOPT_REPO1_PATH "=/")); + hrnCfgArgRawZ(argList, cfgOptRepoPath, "/"); strLstAdd(argList, strNewFmt("%s/repo/%s", testPath(), strZ(fileName))); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -491,8 +491,8 @@ testRun(void) TEST_TITLE("get an encrypted file with custom key"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--" CFGOPT_CIPHER_PASS "=custom"); strLstAdd(argList, fileEncCustomName); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -505,8 +505,8 @@ testRun(void) TEST_TITLE("get a raw file"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "--raw"); strLstAdd(argList, fileRawName); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -532,7 +532,7 @@ testRun(void) TEST_TITLE("ignore missing file"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); strLstAddZ(argList, "--" CFGOPT_IGNORE_MISSING); strLstAddZ(argList, BOGUS_STR); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -544,8 +544,8 @@ testRun(void) TEST_TITLE("get file outside of the repo error"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, "/somewhere/" INFO_ARCHIVE_FILE); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -558,8 +558,8 @@ testRun(void) TEST_TITLE("get file in repo root directory error"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAdd(argList, fileEncCustomName); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -572,9 +572,9 @@ testRun(void) TEST_TITLE("get encrypted archive.info - stanza mismatch"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); strLstAddZ(argList, "--" CFGOPT_STANZA "=test2"); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_ARCHIVE "/test/" INFO_ARCHIVE_FILE); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -586,8 +586,8 @@ testRun(void) TEST_TITLE("get encrypted archive.info"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_ARCHIVE "/test/" INFO_ARCHIVE_FILE); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -599,9 +599,9 @@ testRun(void) TEST_TITLE("get encrypted archive.info.copy"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); strLstAddZ(argList, "--" CFGOPT_STANZA "=test"); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_ARCHIVE "/test/" INFO_ARCHIVE_FILE ".copy"); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -613,8 +613,8 @@ testRun(void) TEST_TITLE("get encrypted backup.info"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/" INFO_BACKUP_FILE); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -626,8 +626,8 @@ testRun(void) TEST_TITLE("get encrypted backup.info.copy"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/" INFO_BACKUP_FILE ".copy"); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -642,8 +642,8 @@ testRun(void) TEST_TITLE("get encrypted WAL archive file"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAdd(argList, strNewFmt( "%s/repo/" STORAGE_PATH_ARCHIVE "/test/12-1/000000010000000100000001-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",testPath())); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -656,8 +656,8 @@ testRun(void) TEST_TITLE("get encrypted backup.manifest"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/latest/" BACKUP_MANIFEST_FILE); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -669,8 +669,8 @@ testRun(void) TEST_TITLE("get encrypted backup.manifest.copy"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/latest/" BACKUP_MANIFEST_FILE ".copy"); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -682,8 +682,8 @@ testRun(void) TEST_TITLE("get encrypted backup.history manifest"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAddZ(argList, STORAGE_PATH_BACKUP "/test/backup.history/2020/label.manifest.gz"); harnessCfgLoad(cfgCmdRepoGet, argList); @@ -695,8 +695,8 @@ testRun(void) TEST_TITLE("get encrypted backup_label"); argList = strLstNew(); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s/repo", testPath())); - strLstAddZ(argList, "--" CFGOPT_REPO1_CIPHER_TYPE "=" CIPHER_TYPE_AES_256_CBC); + hrnCfgArgRawFmt(argList, cfgOptRepoPath, "%s/repo", testPath()); + hrnCfgArgRawZ(argList, cfgOptRepoCipherType, CIPHER_TYPE_AES_256_CBC); strLstAdd(argList, strNew(STORAGE_PATH_BACKUP "/test/latest/pg_data/backup_label")); harnessCfgLoad(cfgCmdRepoGet, argList); diff --git a/test/src/module/command/restoreTest.c b/test/src/module/command/restoreTest.c index 46486c464..150947c96 100644 --- a/test/src/module/command/restoreTest.c +++ b/test/src/module/command/restoreTest.c @@ -1945,8 +1945,8 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(repoPath))); - strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strZ(pgPath))); + hrnCfgArgRaw(argList, cfgOptRepoPath, repoPath); + hrnCfgArgRaw(argList, cfgOptPgPath, pgPath); strLstAddZ(argList, "--" CFGOPT_TYPE "=" RECOVERY_TYPE_PRESERVE); strLstAddZ(argList, "--" CFGOPT_SET "=20161219-212741F"); strLstAddZ(argList, "--" CFGOPT_FORCE); diff --git a/test/src/module/config/loadTest.c b/test/src/module/config/loadTest.c index e0fb2d484..890bd2d6c 100644 --- a/test/src/module/config/loadTest.c +++ b/test/src/module/config/loadTest.c @@ -237,7 +237,7 @@ testRun(void) // Invalid bucket name with verification enabled fails argList = strLstNew(); strLstAdd(argList, strNew("--stanza=db")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNew("--repo1-type=s3")); strLstAdd(argList, strNew("--repo1-s3-bucket=bogus.bucket")); strLstAdd(argList, strNew("--repo1-s3-region=region")); @@ -254,7 +254,7 @@ testRun(void) // Invalid bucket name with verification disabled succeeds argList = strLstNew(); strLstAdd(argList, strNew("--stanza=db")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNew("--repo1-type=s3")); strLstAdd(argList, strNew("--repo1-s3-bucket=bogus.bucket")); strLstAdd(argList, strNew("--repo1-s3-region=region")); @@ -268,7 +268,7 @@ testRun(void) // Valid bucket name argList = strLstNew(); strLstAdd(argList, strNew("--stanza=db")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNew("--repo1-type=s3")); strLstAdd(argList, strNew("--repo1-s3-bucket=cool-bucket")); strLstAdd(argList, strNew("--repo1-s3-region=region")); @@ -390,7 +390,7 @@ testRun(void) argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); strLstAdd(argList, strNew("--stanza=db")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNew("--log-level-console=off")); strLstAdd(argList, strNew("--log-level-stderr=off")); strLstAdd(argList, strNew("--log-level-file=off")); @@ -407,7 +407,7 @@ testRun(void) argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); strLstAdd(argList, strNew("--stanza=db")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNew("--no-neutral-umask")); strLstAdd(argList, strNew("--log-level-console=off")); strLstAdd(argList, strNew("--log-level-stderr=off")); @@ -489,7 +489,7 @@ testRun(void) strLstAdd(argList, strNew("pgbackrest")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNewFmt("--log-path=%s", testPath())); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to"); strLstAdd(argList, strNew("--process=1")); strLstAdd(argList, strNew("--host-id=1")); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_REPO); @@ -520,7 +520,7 @@ testRun(void) strLstAdd(argList, strNew("pgbackrest")); strLstAdd(argList, strNewFmt("--log-path=%s", testPath())); strLstAddZ(argList, "--" CFGOPT_STANZA "=test"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_REPO); strLstAddZ(argList, "--" CFGOPT_LOG_LEVEL_FILE "=info"); strLstAddZ(argList, "--" CFGOPT_LOG_SUBPROCESS); @@ -558,7 +558,7 @@ testRun(void) strLstAdd(argList, strNewFmt("--" CFGOPT_LOG_PATH "=%s", testPath())); strLstAdd(argList, strNewFmt("--lock-path=%s/lock", testDataPath())); strLstAddZ(argList, "--" CFGOPT_STANZA "=test"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, CFGCMD_ARCHIVE_GET ":" CONFIG_COMMAND_ROLE_ASYNC); TEST_RESULT_VOID(cfgLoad(strLstSize(argList), strLstPtr(argList)), "open log file"); diff --git a/test/src/module/config/parseTest.c b/test/src/module/config/parseTest.c index 7fbbb10d1..299ad251f 100644 --- a/test/src/module/config/parseTest.c +++ b/test/src/module/config/parseTest.c @@ -4,6 +4,8 @@ Test Configuration Parse #include "protocol/helper.h" #include "storage/storage.intern.h" +#include "common/harnessConfig.h" + #define TEST_BACKREST_EXE "pgbackrest" #define TEST_COMMAND_ARCHIVE_GET "archive-get" @@ -780,7 +782,7 @@ testRun(void) argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); strLstAdd(argList, strNew("--host-id=1")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to"); strLstAdd(argList, strNew("--process=1")); strLstAdd(argList, strNew("--stanza=db")); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_REPO); @@ -795,7 +797,7 @@ testRun(void) argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to"); strLstAdd(argList, strNew("--process=1")); strLstAdd(argList, strNew("--stanza=db")); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_REPO); @@ -1133,7 +1135,7 @@ testRun(void) argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); strLstAdd(argList, strNew("--stanza=db")); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNew(TEST_COMMAND_ARCHIVE_GET)); strLstAdd(argList, strNew("000000010000000200000003")); strLstAdd(argList, strNew("/path/to/wal/RECOVERYWAL")); @@ -1185,7 +1187,7 @@ testRun(void) strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNewFmt("--config=%s", strZ(configFile))); strLstAdd(argList, strNew("--no-online")); - strLstAddZ(argList, "--" CFGOPT_PG2_LOCAL); + hrnCfgArgKeyRawBool(argList, cfgOptPgLocal, 2, true); strLstAdd(argList, strNew("--reset-pg1-host")); strLstAdd(argList, strNew("--reset-backup-standby")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); @@ -1202,34 +1204,36 @@ testRun(void) storagePutP( storageNewWriteP(storageLocalWrite(), configFile), - BUFSTRDEF( - "[global]\n" - "compress-level=3\n" - "spool-path=/path/to/spool\n" - "lock-path=/\n" - "\n" - "[global:backup]\n" - "repo1-hardlink=y\n" - "bogus=bogus\n" - "no-delta=y\n" - "reset-delta=y\n" - "archive-copy=y\n" - "start-fast=y\n" - "online=y\n" - "pg1-path=/not/path/to/db\n" - "backup-standby=y\n" - "buffer-size=65536\n" - "\n" - "[db:backup]\n" - "delta=n\n" - "recovery-option=a=b\n" - "\n" - "[db]\n" - "pg1-host=db\n" - "pg1-path=/path/to/db\n" - CFGOPT_PG2_HOST "=ignore\n" - CFGOPT_PG2_PATH "=/path/to/db2\n" - "recovery-option=c=d\n")); + BUFSTR( + strNewFmt( + "[global]\n" + "compress-level=3\n" + "spool-path=/path/to/spool\n" + "lock-path=/\n" + "\n" + "[global:backup]\n" + "repo1-hardlink=y\n" + "bogus=bogus\n" + "no-delta=y\n" + "reset-delta=y\n" + "archive-copy=y\n" + "start-fast=y\n" + "online=y\n" + "pg1-path=/not/path/to/db\n" + "backup-standby=y\n" + "buffer-size=65536\n" + "\n" + "[db:backup]\n" + "delta=n\n" + "recovery-option=a=b\n" + "\n" + "[db]\n" + "pg1-host=db\n" + "pg1-path=/path/to/db\n" + "%s=ignore\n" + "%s=/path/to/db2\n" + "recovery-option=c=d\n", + cfgOptionName(cfgOptPgHost + 1), cfgOptionName(cfgOptPgPath + 1)))); TEST_RESULT_VOID(configParse(strLstSize(argList), strLstPtr(argList), false), TEST_COMMAND_BACKUP " command"); harnessLogResult( diff --git a/test/src/module/config/protocolTest.c b/test/src/module/config/protocolTest.c index f16a5ffee..196ff381c 100644 --- a/test/src/module/config/protocolTest.c +++ b/test/src/module/config/protocolTest.c @@ -31,7 +31,7 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--repo1-host=repo-host"); strLstAddZ(argList, "--repo1-host-user=repo-host-user"); harnessCfgLoad(cfgCmdArchiveGet, argList); diff --git a/test/src/module/info/infoBackupTest.c b/test/src/module/info/infoBackupTest.c index 62845f0f7..358c27600 100644 --- a/test/src/module/info/infoBackupTest.c +++ b/test/src/module/info/infoBackupTest.c @@ -447,7 +447,7 @@ testRun(void) // Load configuration to set repo-path and stanza StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNewFmt("--repo-path=%s", testPath())); harnessCfgLoad(cfgCmdArchiveGet, argList); diff --git a/test/src/module/protocol/protocolTest.c b/test/src/module/protocol/protocolTest.c index c9c4fc3f3..d4c80bc9f 100644 --- a/test/src/module/protocol/protocolTest.c +++ b/test/src/module/protocol/protocolTest.c @@ -129,7 +129,7 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "archive-get"); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); @@ -140,7 +140,7 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--repo1-host=remote-host"); strLstAddZ(argList, "archive-get"); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); @@ -168,7 +168,7 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--" CFGOPT_STANZA "=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_HOST "=test1"); + hrnCfgArgRawZ(argList, cfgOptPgHost, "test1"); strLstAddZ(argList, "--pg1-path=/path/to"); strLstAddZ(argList, "restore"); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); @@ -182,13 +182,13 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/bogus"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/bogus"); strLstAddZ(argList, "--pg7-path=/path/to"); strLstAddZ(argList, "--pg7-host=test1"); strLstAddZ(argList, "--host-id=7"); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_PG); strLstAddZ(argList, "--process=0"); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, CFGCMD_BACKUP ":" CONFIG_COMMAND_ROLE_LOCAL); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); @@ -222,7 +222,7 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "archive-get"); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); @@ -257,7 +257,7 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--repo1-host=repo-host"); strLstAddZ(argList, "--repo1-host-user=repo-host-user"); // Local config settings should never be passed to the remote @@ -279,8 +279,8 @@ testRun(void) strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--stanza=test1"); strLstAddZ(argList, "--log-subprocess"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/unused"); // Will be passed to remote (required) - strLstAddZ(argList, "--" CFGOPT_PG1_PORT "=777"); // Not be passed to remote (required but has default) + hrnCfgArgRawZ(argList, cfgOptPgPath, "/unused"); // Will be passed to remote (required) + hrnCfgArgRawZ(argList, cfgOptPgPort, "777"); // Not be passed to remote (required but has default) strLstAddZ(argList, "--repo1-host=repo-host"); strLstAddZ(argList, "--repo1-host-port=444"); strLstAddZ(argList, "--repo1-host-config=/path/pgbackrest.conf"); @@ -302,7 +302,7 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "pgbackrest"); strLstAddZ(argList, "--stanza=test1"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--process=3"); strLstAddZ(argList, "--host-id=1"); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_REPO); @@ -346,7 +346,7 @@ testRun(void) strLstAddZ(argList, "--pg2-path=/path/to/2"); strLstAddZ(argList, "--pg2-host=pg2-host"); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_PG); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, CFGCMD_BACKUP ":" CONFIG_COMMAND_ROLE_LOCAL); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); @@ -369,7 +369,7 @@ testRun(void) strLstAddZ(argList, "--pg3-socket-path=/socket3"); strLstAddZ(argList, "--pg3-port=3333"); strLstAddZ(argList, "--" CFGOPT_REMOTE_TYPE "=" PROTOCOL_REMOTE_TYPE_PG); - strLstAddZ(argList, "--" CFGOPT_REPO1_RETENTION_FULL "=1"); + hrnCfgArgRawZ(argList, cfgOptRepoRetentionFull, "1"); strLstAddZ(argList, CFGCMD_BACKUP ":" CONFIG_COMMAND_ROLE_LOCAL); harnessCfgLoadRaw(strLstSize(argList), strLstPtr(argList)); @@ -970,7 +970,7 @@ testRun(void) argList = strLstNew(); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--protocol-timeout=10"); strLstAdd(argList, strNewFmt("--config=%s/pgbackrest.conf", testPath())); strLstAddZ(argList, "--repo1-host=localhost"); @@ -1029,7 +1029,7 @@ testRun(void) // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--protocol-timeout=10"); strLstAddZ(argList, "--process-max=2"); harnessCfgLoad(cfgCmdArchiveGet, argList); diff --git a/test/src/module/storage/azureTest.c b/test/src/module/storage/azureTest.c index cc9eb0fd9..2ad9ee4c5 100644 --- a/test/src/module/storage/azureTest.c +++ b/test/src/module/storage/azureTest.c @@ -182,11 +182,11 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test"); - strLstAddZ(argList, "--" CFGOPT_REPO1_TYPE "=" STORAGE_AZURE_TYPE); - strLstAddZ(argList, "--" CFGOPT_REPO1_PATH "=/repo"); - strLstAddZ(argList, "--" CFGOPT_REPO1_AZURE_CONTAINER "=" TEST_CONTAINER); - setenv("PGBACKREST_" CFGOPT_REPO1_AZURE_ACCOUNT, TEST_ACCOUNT, true); - setenv("PGBACKREST_" CFGOPT_REPO1_AZURE_KEY, TEST_KEY_SHARED, true); + hrnCfgArgRawZ(argList, cfgOptRepoType, STORAGE_AZURE_TYPE); + hrnCfgArgRawZ(argList, cfgOptRepoPath, "/repo"); + hrnCfgArgRawZ(argList, cfgOptRepoAzureContainer, TEST_CONTAINER); + hrnCfgEnvRawZ(cfgOptRepoAzureAccount, TEST_ACCOUNT); + hrnCfgEnvRawZ(cfgOptRepoAzureKey, TEST_KEY_SHARED); harnessCfgLoad(cfgCmdArchivePush, argList); Storage *storage = NULL; @@ -288,14 +288,14 @@ testRun(void) StringList *argList = strLstNew(); strLstAddZ(argList, "--" CFGOPT_STANZA "=test"); - strLstAddZ(argList, "--" CFGOPT_REPO1_TYPE "=" STORAGE_AZURE_TYPE); - strLstAddZ(argList, "--" CFGOPT_REPO1_PATH "=/"); - strLstAddZ(argList, "--" CFGOPT_REPO1_AZURE_CONTAINER "=" TEST_CONTAINER); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_AZURE_HOST "=%s", strZ(hrnServerHost()))); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_AZURE_PORT "=%u", hrnServerPort(0))); - strLstAdd(argList, strNewFmt("--%s" CFGOPT_REPO1_AZURE_VERIFY_TLS, testContainer() ? "" : "no-")); - setenv("PGBACKREST_" CFGOPT_REPO1_AZURE_ACCOUNT, TEST_ACCOUNT, true); - setenv("PGBACKREST_" CFGOPT_REPO1_AZURE_KEY, TEST_KEY_SHARED, true); + hrnCfgArgRawZ(argList, cfgOptRepoType, STORAGE_AZURE_TYPE); + hrnCfgArgRawZ(argList, cfgOptRepoPath, "/"); + hrnCfgArgRawZ(argList, cfgOptRepoAzureContainer, TEST_CONTAINER); + hrnCfgArgRaw(argList, cfgOptRepoAzureHost, hrnServerHost()); + hrnCfgArgRawFmt(argList, cfgOptRepoAzurePort, "%u", hrnServerPort(0)); + hrnCfgArgRawBool(argList, cfgOptRepoAzureVerifyTls, testContainer()); + hrnCfgEnvRawZ(cfgOptRepoAzureAccount, TEST_ACCOUNT); + hrnCfgEnvRawZ(cfgOptRepoAzureKey, TEST_KEY_SHARED); harnessCfgLoad(cfgCmdArchivePush, argList); Storage *storage = NULL; @@ -727,8 +727,8 @@ testRun(void) hrnServerScriptClose(service); - strLstAddZ(argList, "--" CFGOPT_REPO1_AZURE_KEY_TYPE "=" STORAGE_AZURE_KEY_TYPE_SAS); - setenv("PGBACKREST_" CFGOPT_REPO1_AZURE_KEY, TEST_KEY_SAS, true); + hrnCfgArgRawZ(argList, cfgOptRepoAzureKeyType, STORAGE_AZURE_KEY_TYPE_SAS); + hrnCfgEnvRawZ(cfgOptRepoAzureKey, TEST_KEY_SAS); harnessCfgLoad(cfgCmdArchivePush, argList); TEST_ASSIGN(storage, storageRepoGet(strNew(STORAGE_AZURE_TYPE), true), "get repo storage"); diff --git a/test/src/module/storage/cifsTest.c b/test/src/module/storage/cifsTest.c index f8f760b80..52afa9fd0 100644 --- a/test/src/module/storage/cifsTest.c +++ b/test/src/module/storage/cifsTest.c @@ -17,7 +17,7 @@ testRun(void) // Load configuration StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAddZ(argList, "--repo1-type=cifs"); strLstAdd(argList, strNewFmt("--repo1-path=%s", testPath())); harnessCfgLoad(cfgCmdArchiveGet, argList); diff --git a/test/src/module/storage/posixTest.c b/test/src/module/storage/posixTest.c index 9060ee2f0..438bb3b6b 100644 --- a/test/src/module/storage/posixTest.c +++ b/test/src/module/storage/posixTest.c @@ -1159,7 +1159,7 @@ testRun(void) // Load configuration to set repo-path and stanza StringList *argList = strLstNew(); strLstAddZ(argList, "--stanza=db"); - strLstAddZ(argList, "--" CFGOPT_PG1_PATH "=/path/to/pg"); + hrnCfgArgRawZ(argList, cfgOptPgPath, "/path/to/pg"); strLstAdd(argList, strNewFmt("--repo-path=%s", testPath())); harnessCfgLoad(cfgCmdArchiveGet, argList); diff --git a/test/src/module/storage/s3Test.c b/test/src/module/storage/s3Test.c index 5636ca43c..fbcf40a8c 100644 --- a/test/src/module/storage/s3Test.c +++ b/test/src/module/storage/s3Test.c @@ -229,18 +229,22 @@ testRun(void) // Config settings that are required for every test (without endpoint for special tests) StringList *commonArgWithoutEndpointList = strLstNew(); strLstAddZ(commonArgWithoutEndpointList, "--" CFGOPT_STANZA "=db"); - strLstAddZ(commonArgWithoutEndpointList, "--" CFGOPT_REPO1_TYPE "=s3"); - strLstAdd(commonArgWithoutEndpointList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strZ(path))); - strLstAdd(commonArgWithoutEndpointList, strNewFmt("--" CFGOPT_REPO1_S3_BUCKET "=%s", strZ(bucket))); - strLstAdd(commonArgWithoutEndpointList, strNewFmt("--" CFGOPT_REPO1_S3_REGION "=%s", strZ(region))); + hrnCfgArgRawZ(commonArgWithoutEndpointList, cfgOptRepoType, "s3"); + hrnCfgArgRaw(commonArgWithoutEndpointList, cfgOptRepoPath, path); + hrnCfgArgRaw(commonArgWithoutEndpointList, cfgOptRepoS3Bucket, bucket); + hrnCfgArgRaw(commonArgWithoutEndpointList, cfgOptRepoS3Region, region); // TLS can only be verified in a container if (!testContainer()) - strLstAddZ(commonArgWithoutEndpointList, "--no-" CFGOPT_REPO1_S3_VERIFY_TLS); + hrnCfgArgRawBool(commonArgWithoutEndpointList, cfgOptRepoS3VerifyTls, false); // Config settings that are required for every test (with endpoint) StringList *commonArgList = strLstDup(commonArgWithoutEndpointList); - strLstAdd(commonArgList, strNewFmt("--" CFGOPT_REPO1_S3_ENDPOINT "=%s", strZ(endPoint))); + hrnCfgArgRaw(commonArgList, cfgOptRepoS3Endpoint, endPoint); + + // Secure options must be loaded into environment variables + hrnCfgEnvRaw(cfgOptRepoS3Key, accessKey); + hrnCfgEnvRaw(cfgOptRepoS3KeySecret, secretAccessKey); // ***************************************************************************************************************************** if (testBegin("storageS3DateTime() and storageS3Auth()")) @@ -251,8 +255,6 @@ testRun(void) TEST_TITLE("config without token"); StringList *argList = strLstDup(commonArgList); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY, strZ(accessKey), true); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY_SECRET, strZ(secretAccessKey), true); harnessCfgLoad(cfgCmdArchivePush, argList); StorageS3 *driver = (StorageS3 *)storageDriver(storageRepoGet(STORAGE_S3_TYPE_STR, false)); @@ -320,12 +322,10 @@ testRun(void) TEST_TITLE("config with token, endpoint with custom port, and ca-file/path"); argList = strLstDup(commonArgWithoutEndpointList); - strLstAddZ(argList, "--" CFGOPT_REPO1_S3_ENDPOINT "=custom.endpoint:333"); - strLstAddZ(argList, "--" CFGOPT_REPO1_S3_CA_PATH "=/path/to/cert"); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_S3_CA_FILE "=%s/" HRN_SERVER_CERT_PREFIX ".crt", testRepoPath())); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY, strZ(accessKey), true); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY_SECRET, strZ(secretAccessKey), true); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_TOKEN, strZ(securityToken), true); + hrnCfgArgRawZ(argList, cfgOptRepoS3Endpoint, "custom.endpoint:333"); + hrnCfgArgRawZ(argList, cfgOptRepoS3CaPath, "/path/to/cert"); + hrnCfgArgRawFmt(argList, cfgOptRepoS3CaFile, "%s/" HRN_SERVER_CERT_PREFIX ".crt", testRepoPath()); + hrnCfgEnvRaw(cfgOptRepoS3Token, securityToken); harnessCfgLoad(cfgCmdArchivePush, argList); driver = (StorageS3 *)storageDriver(storageRepoGet(STORAGE_S3_TYPE_STR, false)); @@ -388,10 +388,8 @@ testRun(void) TEST_TITLE("config with keys, token, and host with custom port"); StringList *argList = strLstDup(commonArgList); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_S3_HOST "=%s:%u", strZ(host), port)); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY, strZ(accessKey), true); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY_SECRET, strZ(secretAccessKey), true); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_TOKEN, strZ(securityToken), true); + hrnCfgArgRawFmt(argList, cfgOptRepoS3Host, "%s:%u", strZ(host), port); + hrnCfgEnvRaw(cfgOptRepoS3Token, securityToken); harnessCfgLoad(cfgCmdArchivePush, argList); Storage *s3 = storageRepoGet(STORAGE_S3_TYPE_STR, true); @@ -447,9 +445,9 @@ testRun(void) hrnServerScriptClose(service); argList = strLstDup(commonArgList); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_S3_HOST "=%s:%u", strZ(host), port)); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_S3_ROLE "=%s", strZ(credRole))); - strLstAddZ(argList, "--" CFGOPT_REPO1_S3_KEY_TYPE "=" STORAGE_S3_KEY_TYPE_AUTO); + hrnCfgArgRawFmt(argList, cfgOptRepoS3Host, "%s:%u", strZ(host), port); + hrnCfgArgRaw(argList, cfgOptRepoS3Role, credRole); + hrnCfgArgRawZ(argList, cfgOptRepoS3KeyType, STORAGE_S3_KEY_TYPE_AUTO); harnessCfgLoad(cfgCmdArchivePush, argList); s3 = storageRepoGet(STORAGE_S3_TYPE_STR, true); @@ -1015,12 +1013,10 @@ testRun(void) hrnServerScriptClose(service); argList = strLstDup(commonArgList); - strLstAddZ(argList, "--" CFGOPT_REPO1_S3_URI_STYLE "=" STORAGE_S3_URI_STYLE_PATH); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_S3_HOST "=%s", strZ(host))); - strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_S3_PORT "=%u", port)); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY, strZ(accessKey), true); - setenv("PGBACKREST_" CFGOPT_REPO1_S3_KEY_SECRET, strZ(secretAccessKey), true); - unsetenv("PGBACKREST_" CFGOPT_REPO1_S3_TOKEN); + hrnCfgArgRawZ(argList, cfgOptRepoS3UriStyle, STORAGE_S3_URI_STYLE_PATH); + hrnCfgArgRaw(argList, cfgOptRepoS3Host, host); + hrnCfgArgRawFmt(argList, cfgOptRepoS3Port, "%u", port); + hrnCfgEnvRemoveRaw(cfgOptRepoS3Token); harnessCfgLoad(cfgCmdArchivePush, argList); s3 = storageRepoGet(STORAGE_S3_TYPE_STR, true);