fix: teach Gvedit `-?` on macOS

This is the equivalent of aa695fabf4ff342488229aabd43c0970470d711f and friends,
but for Gvedit. It was not previously detected that this problem also affects
Gvedit because it is not currently built on macOS in CI. That will be improved
in an upcoming commit.

Gitlab: #1842, #1852

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d5e948997c607c3407c030045d8bd05e8934887..a9ca5379b8ca87cdcfeb361364aadbca95d316d9 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - lneato -? sometimes fails with STATUS_STACK_BUFFER_OVERRUN on Windows #1934
 - expr misinterprets `<<` and `>>` #2103
 - stdout and stderr are not flushed at exit on MinGW #2178
+- Gvedit on macOS now understands the `-?` help command line argument
 
 ## [2.50.0] – 2021-12-04
 

diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp
index 285deda8c5c3f74959c0062ab71685aee9b49d4f..5bd608fb9c67bb4e8f61de7fe89aeb334c2332aa 100644 (file)
--- a/cmd/gvedit/main.cpp
+++ b/cmd/gvedit/main.cpp
@@ -60,7 +60,7 @@ static char **parseArgs(int argc, char *argv[])
            Verbose = 1;
            break;
        case '?':
-           if (optopt == '\0')
+           if (optopt == '\0' || optopt == '?')
                usage(0);
            else {
                errout << cmd << " : option -" << ((char) optopt) <<