SERVER-8510 Get rid of CmdLine struct and use new option handling style

1 files changed, 23 insertions, 0 deletions

diff --git a/src/mongo/db/mongod_options.h b/src/mongo/db/mongod_options.h
index e507802684d..b5bab35e441 100644
--- a/src/mongo/db/mongod_options.h
+++ b/src/mongo/db/mongod_options.h
@@ -29,6 +29,8 @@
 #pragma once
 
 #include "mongo/base/status.h"
+#include "mongo/db/server_options.h"
+#include "mongo/db/storage_options.h"
 
 namespace mongo {
 
@@ -38,7 +40,28 @@ namespace mongo {
 
     namespace moe = mongo::optionenvironment;
 
+    struct MongodGlobalParams {
+        bool upgrade;
+        bool repair;
+        bool scriptingEnabled; // --noscripting
+
+        MongodGlobalParams() :
+            upgrade(0),
+            repair(0),
+            scriptingEnabled(true)
+        { }
+    };
+
+    extern MongodGlobalParams mongodGlobalParams;
+
     Status addMongodOptions(moe::OptionSection* options);
 
+    void printMongodHelp(const moe::OptionSection& options);
+
+    Status handlePreValidationMongodOptions(const moe::Environment& params,
+                                            const std::vector<std::string>& args);
+
+    Status storeMongodOptions(const moe::Environment& params, const std::vector<std::string>& args);
+
     Status addModuleOptions(moe::OptionSection* options);
 }