gv2gxl, gxl2gv: fix mode detection on Windows

Gitlab: fixes #2344

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9ac11c19a9c8c130d9fb13b63b6091777fafd1b..a1331e5f3c9b221df116b4b1dffade88616c0c95 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The `pic` output renderer uses PIC or troff comments where appropriate, fixing
   a problem that resulted in comments being misinterpreted by `groff` and being
   visible in the final output. #2341
+- `gv2gxl` and `gxl2gv` correctly detect their mode (gv→gxl or gxl→gv) on
+  Windows when called via an absolute or relative path. #2344
 
 ## [7.1.0] – 2023-01-21
 

diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c
index 2ce7d34859d6303937b183e0bbdd1583a4ed60cf..22d8617c514273d8ec22e85144517aad55e1f7bf 100644 (file)
--- a/cmd/tools/cvtgxl.c
+++ b/cmd/tools/cvtgxl.c
@@ -96,6 +96,11 @@ static char *cmdName(char *path)
        sp++;
     else
        sp = path;
+#if _WIN32
+    char *sp2 = strrchr(sp, '\\');
+    if (sp2 != NULL)
+       sp = sp2 + 1;
+#endif
     return sp;
 }
 

diff --git a/tests/test_regression.py b/tests/test_regression.py
index dc90f473dd12d01015e644bb631a1c0635e36762..de2009a36c0ee14511be209a29d603ea114e944e 100644 (file)
--- a/tests/test_regression.py
+++ b/tests/test_regression.py
@@ -327,7 +327,6 @@ def test_358():
 
 @pytest.mark.skipif(which("gv2gxl") is None or which("gxl2gv") is None,
                     reason="GXL tools not available")
-@pytest.mark.xfail() # FIXME: #2344
 def test_517():
   """
   round tripping a graph through gv2gxl should not lose HTML labels