fix for bug 6641

* change shell API to only use "edit level" when needed.
* add factory functions for cstore creation to simplify code.
(cherry picked from commit 2208bfef1004295d3227492c6a3e9d7b36903db5)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/cli_bin.cpp b/src/cli_bin.cpp
index 9528277..e8ff95a 100644
--- a/src/cli_bin.cpp
+++ b/src/cli_bin.cpp
@@ -15,13 +15,14 @@
  */
 
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <vector>
 #include <string>
 #include <libgen.h>
 
 #include <cli_cstore.h>
-#include <cstore/unionfs/cstore-unionfs.hpp>
+#include <cstore/cstore.hpp>
 
 static int op_idx = -1;
 static const char *op_bin_name[] = {
@@ -218,14 +219,15 @@ main(int argc, char **argv)
   }
 
   // actual CLI operations use the edit levels from environment, so pass true.
-  UnionfsCstore cstore(true);
+  Cstore *cstore = Cstore::createCstore(true);
   vector<string> path_comps;
   for (int i = 1; i < argc; i++) {
     path_comps.push_back(argv[i]);
   }
 
   // call the op function
-  OpFunc[op_idx](cstore, path_comps);
+  OpFunc[op_idx](*cstore, path_comps);
+  delete cstore;
   exit(0);
 }