fix env parsing

diff --git a/src/cfuse.cc b/src/cfuse.cc
index d21fb1db5da6bda8a7302225ee23bda49c108221..9d9e20043ebd2f4173a0c958528a3ab0b27ef5ee 100644 (file)
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -42,6 +42,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   //cerr << "cfuse starting " << myrank << "/" << world << std::endl;
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
   parse_config_options(args);
 
   // args for fuse

diff --git a/src/cmds.cc b/src/cmds.cc
index 3042ac68527247f889d062b9d3b56af9c5cee3bc..04a12e99260e36719d9b1a3e8227e44713f01950 100644 (file)
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -36,7 +36,7 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-
+  env_to_vec(args);
   parse_config_options(args);
 
   // mds specific args

diff --git a/src/cmon.cc b/src/cmon.cc
index fed5bfbed64fde984864e4cd61614bed8789fc68..d82e23b555642c46979c36b424af0446d13748e4 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -47,6 +47,7 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
   parse_config_options(args);
 
   // args

diff --git a/src/cmonctl.cc b/src/cmonctl.cc
index 44a8dfe31affb3bd74564b0e27ac59a930715cf0..0bbbab67608abb4093859ce839c7a6baa7a0d8e7 100644 (file)
--- a/src/cmonctl.cc
+++ b/src/cmonctl.cc
@@ -94,6 +94,7 @@ int main(int argc, const char **argv, const char *envp[]) {
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
   parse_config_options(args);
 
   vec_to_argv(args, argc, argv);

diff --git a/src/config.cc b/src/config.cc
index 94374e1fdfae0be92d1787d0222c41aa6bf8cfab..75f5a97952aed52feb24264ea1959e29b6d088f5 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -514,8 +514,6 @@ void argv_to_vec(int argc, const char **argv,
 {
   for (int i=1; i<argc; i++)
     args.push_back(argv[i]);
-
-  env_to_vec(args);
 }
 
 void vec_to_argv(std::vector<const char*>& args,

diff --git a/src/cosd.cc b/src/cosd.cc
index cbca0e61f21601ea3f4a57542c40de267c79a0f1..963a86cc9e0314c7b6e46c3d0b18440391ecdacd 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -49,7 +49,7 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-
+  env_to_vec(args);
   parse_config_options(args);
 
   if (g_conf.clock_tare) g_clock.tare();

diff --git a/src/dumpjournal.cc b/src/dumpjournal.cc
index 7696293e463bcb4ad2026d5a0491dfe6e3042df6..a190a685ef6c49370b1c3fec94df5f0ecd9fcc92 100644 (file)
--- a/src/dumpjournal.cc
+++ b/src/dumpjournal.cc
@@ -70,6 +70,7 @@ int main(int argc, const char **argv, const char *envp[])
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
   parse_config_options(args);
 
   vec_to_argv(args, argc, argv);

diff --git a/src/dupstore.cc b/src/dupstore.cc
index 29b4ff270d0febfe8a11cb1637d789666ba1d3a1..bd2c8dd324963871935a2033949813ec258b85b2 100644 (file)
--- a/src/dupstore.cc
+++ b/src/dupstore.cc
@@ -84,6 +84,7 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
   parse_config_options(args);
 
   // args

diff --git a/src/fakefuse.cc b/src/fakefuse.cc
index db4356e7aa53e103a350890622840c755fea7767..b4319e4335b30922c305b6e9acd52bb573517107 100644 (file)
--- a/src/fakefuse.cc
+++ b/src/fakefuse.cc
@@ -67,6 +67,7 @@ int main(int argc, const char **argv) {
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
   parse_config_options(args);
 
   // start messenger thread

diff --git a/src/fakesyn.cc b/src/fakesyn.cc
index 804826bdb6409842887c61fa701234a27fa86436..71b78de53d285f8a0dc95450cd26ff6649006901 100644 (file)
--- a/src/fakesyn.cc
+++ b/src/fakesyn.cc
@@ -59,6 +59,7 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
 
   // stop on our own (by default)
   g_conf.mon_stop_on_last_unmount = true;

diff --git a/src/monmaptool.cc b/src/monmaptool.cc
index db8efa46475daaf1b54b4ecc2acf94a0c2f4fef7..e210f60fe1d530f34b688cffd1e87f80e8ec95d5 100644 (file)
--- a/src/monmaptool.cc
+++ b/src/monmaptool.cc
@@ -73,7 +73,8 @@ int main(int argc, const char **argv)
       clobber = true;
     else if (strcmp(args[i], "--add") == 0 ||
             strcmp(args[i], "--rm") == 0) {
-      if (++i >= args.size()) usage(me);
+      if (++i >= args.size())
+       usage(me);
       entity_addr_t addr;
       if (!parse_ip_port(args[i], addr)) {
        cerr << me << ": invalid ip:port '" << args[i] << "'" << std::endl;
@@ -87,8 +88,10 @@ int main(int argc, const char **argv)
       modified = true;
     } else if (!fn)
       fn = args[i];
-    else 
+    else {
+      cout << "what is '" << args[i] << "'" << std::endl;
       usage(me);
+    }
   }
   if (!fn)
     usage(me);

diff --git a/src/newsyn.cc b/src/newsyn.cc
index e67ff5eeb89fb21a8f818bff610499e9f85c3599..05518867d88701a34882fdefb842ae94a3236fef 100644 (file)
--- a/src/newsyn.cc
+++ b/src/newsyn.cc
@@ -199,6 +199,8 @@ int main(int argc, const char **argv)
   g_conf.mon_stop_on_last_unmount = true;
   g_conf.mon_stop_with_last_mds = true;
 
+  env_to_vec(args);
+
   parse_config_options(args);
   parse_syn_options(args);
 

diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc
index 44de69cf490d15f9ba2efe0b048a7cdd29ed926c..f468b7ea1c9ffcac0b942349e34e6ab2a5292525 100644 (file)
--- a/src/osdmaptool.cc
+++ b/src/osdmaptool.cc
@@ -77,6 +77,7 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
+  env_to_vec(args);
   parse_config_options(args);
 
   const char *me = argv[0];