From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 27 Jan 2022 22:08:03 +0000 (+1100)
Subject: fix: teach Gvedit `-?` on macOS
X-Git-Tag: 3.0.0~48^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4925c87f1e28a1bc66d111ef046e4e083db8c5b;p=graphviz

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 2d5e94899..a9ca5379b 100644
--- 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 285deda8c..5bd608fb9 100644
--- 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) <<