add vi regex support and some long options on core tools
2 files changed