diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-01-06 16:48:16 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-01-06 16:48:16 +0000 |
| commit | b2a13ed87d102caf87aef1cf9f9486f399aba8f7 (patch) | |
| tree | 13862912c9a492ecdd7a3cc9410d6ad7db165b11 | |
| parent | Initialize the test data written (diff) | |
| download | netfs-b2a13ed87d102caf87aef1cf9f9486f399aba8f7.tar.bz2 netfs-b2a13ed87d102caf87aef1cf9f9486f399aba8f7.tar.xz netfs-b2a13ed87d102caf87aef1cf9f9486f399aba8f7.zip | |
Read ICE communicator args from options
Not just command line args, doesn't work when passed in -oargs, like
from fstab
| -rw-r--r-- | netfs/fuse/fuseApp.cpp | 5 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/netfs/fuse/fuseApp.cpp b/netfs/fuse/fuseApp.cpp index d4835b9..6064e67 100644 --- a/netfs/fuse/fuseApp.cpp +++ b/netfs/fuse/fuseApp.cpp @@ -15,7 +15,7 @@ namespace AdHoc { } NetFS::FuseApp::FuseApp(const Ice::StringSeq & a) : - args(a), + iceArgs(a), sessionOpened(false), openHandleId(0), converter(userLookup, groupLookup) @@ -75,7 +75,7 @@ NetFS::FuseApp::ReadConfiguration(const boost::filesystem::path & path) const void * NetFS::FuseApp::init(struct fuse_conn_info *) { - ic = Ice::initialize(args); + ic = Ice::initialize(iceArgs); fcr = configurator(); return NULL; } @@ -105,6 +105,7 @@ int NetFS::FuseApp::opt_parse(void *, const char * arg, int, struct fuse_args *) { if (strncmp(arg, "--Ice.", 6) == 0) { + iceArgs.push_back(arg); return 0; } else if (strncmp(arg, "_netdev", 7) == 0) { diff --git a/netfs/fuse/fuseApp.h b/netfs/fuse/fuseApp.h index 9653a55..f37acb7 100644 --- a/netfs/fuse/fuseApp.h +++ b/netfs/fuse/fuseApp.h @@ -121,7 +121,7 @@ namespace NetFS { ReqEnv reqEnv(); - Ice::StringSeq args; + Ice::StringSeq iceArgs; Ice::CommunicatorPtr ic; Client::ResourcePtr fcr; mutable std::shared_mutex _proxymaplock; |