diff options
author | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-09-06 15:16:09 -0700 |
---|---|---|
committer | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-09-06 15:28:45 -0700 |
commit | a00e9db2056723e601295f9fc4a057d04460e588 (patch) | |
tree | 4de9a3e7f9216942d66d333f9a1eb7a27844fcfe | |
parent | 64e5308726304c2b997d9b9f9d48204b703bbcea (diff) | |
download | ceph-a00e9db2056723e601295f9fc4a057d04460e588.tar.gz |
cfuse: use new-style argument parsing stuff
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
-rw-r--r-- | src/cfuse.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/cfuse.cc b/src/cfuse.cc index fe33113046c..18eaa9e42d9 100644 --- a/src/cfuse.cc +++ b/src/cfuse.cc @@ -45,7 +45,6 @@ void usage() } int main(int argc, const char **argv, const char *envp[]) { - DEFINE_CONF_VARS(usage); int filer_flags = 0; //cerr << "cfuse starting " << myrank << "/" << world << std::endl; vector<const char*> args; @@ -54,20 +53,19 @@ int main(int argc, const char **argv, const char *envp[]) { global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS); - - vector<const char*> nargs; - FOR_EACH_ARG(args) { - if (CEPH_ARGPARSE_EQ("localize-reads", '\0')) { + for (std::vector<const char*>::iterator i = args.begin(); i != args.end(); ) { + if (ceph_argparse_double_dash(args, i)) { + break; + } else if (ceph_argparse_flag(args, i, "--localize-reads", (char*)NULL)) { cerr << "setting CEPH_OSD_FLAG_LOCALIZE_READS" << std::endl; filer_flags |= CEPH_OSD_FLAG_LOCALIZE_READS; - } - else { - nargs.push_back(args[i]); + } else { + ++i; } } // args for fuse - vec_to_argv(nargs, argc, argv); + vec_to_argv(args, argc, argv); // FUSE will chdir("/"); be ready. g_conf->chdir = "/"; |