scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 01:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

common_preinit: use non-permuting getopt

Browse Source 
Instead of tweaking the getopt manually, use non-permuting version of
getopt (POSIX-compiliant, indicated by leading '+' in optstring).

This is slightly less error-prone and more readable. Althoug still a
bit tweaking is needed - skipping a non-opt (which can be in the middle
of argv if user cmd uses this syntax). Also options for opts that are
not recognized by this getopt (any aother than -O/-V) will appear as
a non-opt.
This commit is contained in:
Martin Pulec
2024-05-13 08:43:21 +02:00
parent 4d82b59bb3
commit 2909e4646f
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/host.cpp
View File

@@ -327,49 +327,44 @@ static bool parse_opts_set_logging(int argc, char *argv[])
{ {
char *log_opt = nullptr; char *log_opt = nullptr;
static struct option getopt_options[] = { static struct option getopt_options[] = {
{"param", no_argument, nullptr, 'O'}, // no_argument -- sic (!), see below {"param", required_argument, nullptr, 'O'},
{"verbose", optional_argument, nullptr, 'V'}, {"verbose", optional_argument, nullptr, 'V'},
{ nullptr, 0, nullptr, 0 } { nullptr, 0, nullptr, 0 }
}; };
const char *const optstring = "+O:V";
int saved_opterr = opterr; int saved_opterr = opterr;
opterr = 0; // options are further handled in main.cpp opterr = 0; // options are further handled in main.cpp. skip unknown
// modified getopt - process all "argv[0] argv[n]" pairs to avoid permutation
// of argv arguments - we do not have the whole option set in optstring, so it
// would put optargs to the end ("uv -t testcard -V" -> "uv -t -V testcard")
int logging_lvl = 0; int logging_lvl = 0;
bool logger_skip_repeats = true; bool logger_skip_repeats = true;
log_timestamp_mode logger_show_timestamps = LOG_TIMESTAMP_AUTO; log_timestamp_mode logger_show_timestamps = LOG_TIMESTAMP_AUTO;
for (int i = 1; i < argc; ++i) { while (optind < argc) {
char *my_argv[] = { argv[0], argv[i] }; const int ch =
getopt_long(argc, argv, optstring, getopt_options, nullptr);
int ch = 0; switch (ch) {
while ((ch = getopt_long(2, my_argv, "V", getopt_options, case 'V':
NULL)) != -1) { if (optarg == nullptr) {
switch (ch) { log_opt = optarg;
case 'V': } else {
if (optarg) { logging_lvl += 1;
log_opt = optarg;
} else {
logging_lvl += 1;
}
break;
case 'O':
if (i == argc - 1) {
fprintf(stderr, "Missing argument to \"--param\"!\n");
return false;
}
if (!parse_params(argv[i + 1], true)) {
return false;
}
break;
default: // will be handled in main
break;
} }
break;
case 'O':
if (!parse_params(optarg, true)) {
return false;
}
break;
case -1: // skip a non-option (or an argument to an option that
// is not recognized by this getopt)
optind += 1;
break;
case '?': // other option that will be handled in main
break;
default:
abort(); // shouldn't reach here
} }
optind = 1;
} }
optind = 0; optind = 0;
opterr = saved_opterr; opterr = saved_opterr;