diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-04 17:35:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Also generate the string of option letters instead of writing it again

Browse Source
This commit is contained in:
Eric Fischer
2017-04-21 13:56:40 -07:00
parent 6c7a52147b
commit 569fd97475
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+13 -2
View File
@@ -2100,15 +2100,26 @@ int main(int argc, char **argv) {
}; };
static struct option long_options[sizeof(long_options_orig) / sizeof(long_options_orig[0])]; static struct option long_options[sizeof(long_options_orig) / sizeof(long_options_orig[0])];
static char getopt_str[sizeof(long_options_orig) / sizeof(long_options_orig[0]) * 2 + 1];
{ {
size_t out = 0; size_t out = 0;
size_t cout = 0;
for (size_t lo = 0; long_options_orig[lo].name != NULL; lo++) { for (size_t lo = 0; long_options_orig[lo].name != NULL; lo++) {
if (long_options_orig[lo].val != 0) { if (long_options_orig[lo].val != 0) {
long_options[out++] = long_options_orig[lo]; long_options[out++] = long_options_orig[lo];
if (long_options_orig[lo].val > ' ') {
getopt_str[cout++] = long_options_orig[lo].val;
if (long_options_orig[lo].has_arg == required_argument) {
getopt_str[cout++] = ':';
}
}
} }
long_options[out] = {0, 0, 0, 0};
} }
long_options[out] = {0, 0, 0, 0};
getopt_str[cout] = '\0';
for (size_t lo = 0; long_options[lo].name != NULL; lo++) { for (size_t lo = 0; long_options[lo].name != NULL; lo++) {
if (long_options[lo].flag != NULL) { if (long_options[lo].flag != NULL) {
@@ -2127,7 +2138,7 @@ int main(int argc, char **argv) {
} }
} }
while ((i = getopt_long(argc, argv, "n:l:z:Z:B:d:D:m:o:e:x:y:r:b:t:g:p:a:XfFqvPL:A:s:S:M:N:T:", long_options, NULL)) != -1) { while ((i = getopt_long(argc, argv, getopt_str, long_options, NULL)) != -1) {
switch (i) { switch (i) {
case 0: case 0:
break; break;