From 3c7c3ecfd64f2b52007c49759b49c022d40b16a8 Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <vladimir@thecybershadow.net>
Date: Sun, 18 Oct 2015 00:44:23 +0000
Subject: [PATCH] fix Issue 15220 - [REG2.065] std.getopt parses -o=value as
 "=value"

---
 std/getopt.d | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/std/getopt.d b/std/getopt.d
index 1f5154de7..690201acd 100644
--- a/std/getopt.d
+++ b/std/getopt.d
@@ -658,6 +658,8 @@ private bool handleOption(R)(string option, R receiver, ref string[] args,
                 // e.g. -j100 to work as "pass argument 100 to option -j".
                 if (!isAlpha(c))
                 {
+                    if (c == '=')
+                        j++;
                     expanded ~= a[j + 1 .. $];
                     break;
                 }
@@ -931,6 +933,13 @@ private bool optMatch(string arg, string optPattern, ref string value,
     }
     else
     {
+        if (!isLong && eqPos==1)
+        {
+            // argument looks like -o=value
+            value = arg[2 .. $];
+            arg = arg[0 .. 1];
+        }
+        else
         if (!isLong && !cfg.bundling)
         {
             // argument looks like -ovalue and there's no bundling
@@ -1214,6 +1223,7 @@ unittest
     getopt(args, "t", &foo, "d", &bar);
     assert(foo == "hello");
     assert(bar == "bar=baz");
+
     // From bugzilla 5762
     string a;
     args = ["prog", "-a-0x12"];
@@ -1222,11 +1232,23 @@ unittest
     args = ["prog", "--addr=-0x12"];
     getopt(args, config.bundling, "a|addr", &a);
     assert(a == "-0x12");
+
     // From https://d.puremagic.com/issues/show_bug.cgi?id=11764
     args = ["main", "-test"];
     bool opt;
     args.getopt(config.passThrough, "opt", &opt);
     assert(args == ["main", "-test"]);
+
+    // From https://issues.dlang.org/show_bug.cgi?id=15220
+    args = ["main", "-o=str"];
+    string o;
+    args.getopt("o", &o);
+    assert(o == "str");
+
+    args = ["main", "-o=str"];
+    o = null;
+    args.getopt(config.bundling, "o", &o);
+    assert(o == "str");
 }
 
 unittest // 5228