history command: pattern argument improvements

jline · May 12, 2019 · ea8b360 · ea8b360
1 parent 6d2855e
commit ea8b360
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Commands.java b/builtins/src/main/java/org/jline/builtins/Commands.java
@@ -218,12 +218,17 @@ public static void history(LineReader reader, PrintStream out, PrintStream err,
         }
         int argId = 0;
         Pattern pattern = null;
-        if (opt.isSet("m")) {
-            if (opt.args().size() == 0) {
-                throw new IllegalArgumentException();
+        if (opt.isSet("m") && opt.args().size() > 0) {
+            StringBuilder sb = new StringBuilder();
+            char prev = '0';
+            for (char c: opt.args().get(argId++).toCharArray()) {
+                if (c == '*' && prev != '\\' && prev != '.') {
+                    sb.append('.');
+                }
+                sb.append(c);
+                prev = c;
             }
-            String sp = opt.args().get(argId++);
-            pattern = Pattern.compile(sp.toString());
+            pattern = Pattern.compile(sb.toString());
         }
         int firstId = opt.args().size() > argId ? retrieveHistoryId(history, opt.args().get(argId++)) : -17;
         int lastId  = opt.args().size() > argId ? retrieveHistoryId(history, opt.args().get(argId++)) : -1;