Switch to the StringSeq interface where possible because it's considerably less annoying

3 files changed, 9 insertions, 12 deletions

diff --git a/netfs/fuse/fuseApp.cpp b/netfs/fuse/fuseApp.cpp
index 964f412..ac0dab5 100644
--- a/netfs/fuse/fuseApp.cpp
+++ b/netfs/fuse/fuseApp.cpp
@@ -11,9 +11,8 @@
 template class Cache<struct stat, std::string, IceUtil::Shared, IceUtil::Handle<Cacheable<struct stat, std::string, IceUtil::Shared>>>;
 template class OptimisticCallCacheable<struct stat, std::string, IceUtil::Shared>;
 
-NetFS::FuseApp::FuseApp(int & argc, char ** argv) :
-	_argc(argc),
-	_argv(argv),
+NetFS::FuseApp::FuseApp(const Ice::StringSeq & a) :
+	args(a),
 	sessionOpened(false),
 	openDirID(0),
 	openFileID(0)
@@ -48,7 +47,7 @@ NetFS::FuseApp::ReadConfiguration(const std::string & path) const
 void *
 NetFS::FuseApp::init(struct fuse_conn_info *)
 {
-	ic = Ice::initialize(_argc, _argv);
+	ic = Ice::initialize(args);
 	auto fc = ReadConfiguration(configPath);
 	auto e = fc->Resources.find(resourceName);
 	if (e == fc->Resources.end()) {
diff --git a/netfs/fuse/fuseApp.h b/netfs/fuse/fuseApp.h
index 70dd335..3ab1cb0 100644
--- a/netfs/fuse/fuseApp.h
+++ b/netfs/fuse/fuseApp.h
@@ -34,7 +34,7 @@ namespace NetFS {
 			typedef std::map<int, OpenFilePtr> OpenFiles;
 
 		public:
-			FuseApp(int & argc, char ** argv);
+			FuseApp(const Ice::StringSeq &);
 			~FuseApp();
 
 		private:
@@ -96,8 +96,7 @@ namespace NetFS {
 
 			ReqEnv reqEnv();
 
-			int & _argc;
-			char ** _argv;
+			Ice::StringSeq args;
 			Ice::CommunicatorPtr ic;
 			Client::ResourcePtr fcr;
 			mutable boost::shared_mutex _lock;
diff --git a/netfs/fuse/netfs.cpp b/netfs/fuse/netfs.cpp
index f700a74..23996c2 100644
--- a/netfs/fuse/netfs.cpp
+++ b/netfs/fuse/netfs.cpp
@@ -2,28 +2,27 @@
 
 class FuseImpl : public NetFS::FuseApp {
 	public:
-		FuseImpl(int & argc, char ** argv) : NetFS::FuseApp(argc, argv) { }
+		FuseImpl(const Ice::StringSeq & a) : NetFS::FuseApp(a) { }
 
 		struct fuse_context * fuse_get_context() override
 		{
 			return ::fuse_get_context();
 		}
-		
+
 		int fuse_opt_parse(struct fuse_args * args, void * data, const struct fuse_opt opts[], fuse_opt_proc_t proc) override
 		{
 			return ::fuse_opt_parse(args, data, opts, proc);
 		}
 
-		int main(int & argc, char ** argv, const struct fuse_operations * ops) override
+		int main(int argc, char ** argv, const struct fuse_operations * ops) override
 		{
 			return ::fuse_main(argc, argv, ops, this);
 		}
-
 };
 
 int
 main(int argc, char* argv[])
 {
-	return FuseAppBase::run(argc, argv, new FuseImpl(argc, argv));
+	return FuseAppBase::run(argc, argv, new FuseImpl(Ice::argsToStringSeq(argc, argv)));
 }