From ef51bcb8286f317972d29c0323b0bbd4b4e0700d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Aug 2016 00:34:26 +0100
Subject: [PATCH] use commandn everywhere

---
 globs.cc | 9 ++++++---
 main.cc  | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/globs.cc b/globs.cc
index abd3429..2254e2b 100644
--- a/globs.cc
+++ b/globs.cc
@@ -11,6 +11,9 @@ using ostd::Vector;
 using ostd::String;
 using ostd::slice_until;
 
+using cscript::CsState;
+using cscript::TvalRange;
+
 static void ob_get_path_parts(
     Vector<ConstCharRange> &parts, ConstCharRange elem
 ) {
@@ -171,9 +174,9 @@ static String ob_expand_globs(Vector<String> const &src) {
     return ret;
 }
 
-void cs_register_globs(cscript::CsState &csv) {
-    csv.add_command("glob", "C", [](cscript::CsState &cs, ConstCharRange lst) {
-        auto fnames = cscript::util::list_explode(lst);
+void cs_register_globs(CsState &csv) {
+    csv.add_commandn("glob", "C", [](CsState &cs, TvalRange args) {
+        auto fnames = cscript::util::list_explode(args[0].get_strr());
         cs.result->set_str(ob_expand_globs(fnames).disown());
     });
 }
diff --git a/main.cc b/main.cc
index 4cd60f0..e377af5 100644
--- a/main.cc
+++ b/main.cc
@@ -571,10 +571,10 @@ int main(int argc, char **argv) {
 
     osv.register_rulecmds();
 
-    osv.add_command("shell", "C", [](ObState &os, ConstCharRange s) {
+    osv.add_commandn("shell", "C", [](ObState &os, TvalRange args) {
         auto cnt = os.counters.back();
         cnt->incr();
-        tpool.push([cnt, ds = String(s)]() {
+        tpool.push([cnt, ds = String(args[0].get_strr())]() {
             int ret = system(ds.data());
             if (ret && !cnt->result) {
                 cnt->result = ret;