From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Aug 2020 22:24:52 +0000 (+0100)
Subject: wip create table
X-Git-Tag: otter-0.2.0~1142
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8e15de7e0cdeb71434e73d4cbc1fa4a9ae34b150;p=otter.git

wip create table
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index fc7bf5ae..76cabe81 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -96,16 +96,10 @@ struct MainOpts {
 struct Subcommand (
   &'static str, // command
   &'static str, // desc
-  fn(&Subcommand, MainOpts, &[String]),
+  fn(&Subcommand, MainOpts, Vec<String>),
 );
 inventory::collect!(Subcommand);
 
-inventory::submit!{Subcommand(
-  "create-table", "Create a new table", |_sc, mainopts, args|{
-    eprintln!("CREATE-TABLE {:?} {:?}", &mainopts, &args);
-  }
-)}
-
 #[derive(Error,Debug)]
 struct ArgumentParseError(String);
 display_as_debug!(ArgumentParseError);
@@ -213,5 +207,17 @@ fn main() {
     });
   let Subcommand(_,_,call) = sc;
 
-  call(sc, ma.opts, &ma.subargs);
+  let mut subargs = ma.subargs;
+  subargs.insert(0, format!("{} {}",
+                            env::args().next().unwrap(),
+                            &ma.subcommand));
+
+  call(sc, ma.opts, subargs);
 }
+
+inventory::submit!{Subcommand(
+  "create-table", "Create a new table", |_sc, mainopts, args|{
+    
+    eprintln!("CREATE-TABLE {:?} {:?}", &mainopts, &args);
+  }
+)}