Changes for bug 3962 and 4714

2 files changed, 136 insertions, 95 deletions

diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index b528837369c..784f481f8ef 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -77,7 +77,7 @@ private:
 }
 
 static void
-usage(const char* n)
+usage(const string& n)
 {
     cerr << "Usage:\n";
     cerr << "\n";
@@ -123,7 +123,7 @@ printCatalogData(const string& dbName, const Freeze::CatalogData& data)
 }
 
 static int
-run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
+run(Ice::StringSeq& args, const Ice::CommunicatorPtr& communicator)
 {
     vector<string> cppArgs;
     bool debug;
@@ -136,7 +136,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     string valueTypeName;
     string selectExpr;
     string dbEnvName, dbName;
-
+    const string appName = args[0];
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
@@ -154,24 +154,24 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     opts.addOpt("", "select", IceUtilInternal::Options::NeedArg);
     opts.addOpt("c", "catalog");
 
-    vector<string> args;
+    vector<string> noArgs;
     try
     {
 #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
         IceUtil::DummyBCC dummy;
 #endif
-        args = opts.parse(argc, (const char**)argv);
+        noArgs = opts.parse(args);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
-        usage(argv[0]);
+        cerr << appName << ": " << e.reason << endl;
+        usage(appName);
         return EXIT_FAILURE;
     }
 
     if(opts.isSet("h"))
     {
-        usage(argv[0]);
+        usage(appName);
         return EXIT_SUCCESS;
     }
     if(opts.isSet("version"))
@@ -183,19 +183,19 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     {
         if(args.empty())
         {
-            cerr << argv[0] << ": no database environment specified." << endl;
-            usage(argv[0]);
+            cerr << appName << ": no database environment specified." << endl;
+            usage(appName);
             return EXIT_FAILURE;
         }
-        else if(args.size() > 2)
+        else if(noArgs.size() > 2)
         {
-            usage(argv[0]);
+            usage(appName);
             return EXIT_FAILURE;
         }
         try
         {
-            FreezeScript::CatalogDataMap catalog = FreezeScript::readCatalog(communicator, args[0]);
-            if(args.size() == 1)
+            FreezeScript::CatalogDataMap catalog = FreezeScript::readCatalog(communicator, noArgs[0]);
+            if(noArgs.size() == 1)
             {
                 if(catalog.empty())
                 {
@@ -213,10 +213,10 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
             }
             else
             {
-                FreezeScript::CatalogDataMap::const_iterator p = catalog.find(args[1]);
+                FreezeScript::CatalogDataMap::const_iterator p = catalog.find(noArgs[1]);
                 if(p == catalog.end())
                 {
-                    cerr << argv[0] << ": database `" << args[1] << "' not found in environment `" << args[0] << "'."
+                    cerr << appName << ": database `" << noArgs[1] << "' not found in environment `" << noArgs[0] << "'."
                          << endl;
                     return EXIT_FAILURE;
                 }
@@ -229,7 +229,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         }
         catch(const FreezeScript::FailureException& ex)
         {
-            cerr << argv[0] << ": " << ex.reason() << endl;
+            cerr << appName << ": " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
     }
@@ -291,35 +291,35 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         selectExpr = opts.optArg("select");
     }
 
-    if(outputFile.empty() && args.size() != 2)
+    if(outputFile.empty() && noArgs.size() != 2)
     {
-        usage(argv[0]);
+        usage(appName);
         return EXIT_FAILURE;
     }
 
-    if(!args.empty())
+    if(!noArgs.empty())
     {
-        dbEnvName = args[0];
+        dbEnvName = noArgs[0];
     }
-    if(args.size() == 2)
+    if(noArgs.size() == 2)
     {
-        dbName = args[1];
+        dbName = noArgs[1];
     }
     else
     {
-        usage(argv[0]);
+        usage(appName);
         return EXIT_FAILURE;
     }
 
     if(!inputFile.empty() && !selectExpr.empty())
     {
-        cerr << argv[0] << ": an input file cannot be specified with --select" << endl;
+        cerr << appName << ": an input file cannot be specified with --select" << endl;
         return EXIT_FAILURE;
     }
 
     Slice::UnitPtr unit = Slice::Unit::createUnit(true, true, ice);
     FreezeScript::Destroyer<Slice::UnitPtr> unitD(unit);
-    if(!FreezeScript::parseSlice(argv[0], unit, slice, cppArgs, debug))
+    if(!FreezeScript::parseSlice(appName, unit, slice, cppArgs, debug))
     {
         return EXIT_FAILURE;
     }
@@ -337,8 +337,8 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 
         if((!keyTypeName.empty() && valueTypeName.empty()) || (keyTypeName.empty() && !valueTypeName.empty()))
         {
-            cerr << argv[0] << ": a key type and a value type must be specified" << endl;
-            usage(argv[0]);
+            cerr << appName << ": a key type and a value type must be specified" << endl;
+            usage(appName);
             return EXIT_FAILURE;
         }
         else if(!evictor && keyTypeName.empty() && valueTypeName.empty())
@@ -349,7 +349,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
                 FreezeScript::CatalogDataMap::iterator p = catalog.find(dbName);
                 if(p == catalog.end())
                 {
-                    cerr << argv[0] << ": database `" << dbName << "' not found in catalog." << endl;
+                    cerr << appName << ": database `" << dbName << "' not found in catalog." << endl;
                     cerr << "Current catalog databases:" << endl;
                     for(p = catalog.begin(); p != catalog.end(); ++p)
                     {
@@ -372,7 +372,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
             }
             catch(const FreezeScript::FailureException& ex)
             {
-                cerr << argv[0] << ": " << ex.reason() << endl;
+                cerr << appName << ": " << ex.reason() << endl;
                 return EXIT_FAILURE;
             }
         }
@@ -389,7 +389,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         l = unit->lookupType(keyTypeName, false);
         if(l.empty())
         {
-            cerr << argv[0] << ": unknown key type `" << keyTypeName << "'" << endl;
+            cerr << appName << ": unknown key type `" << keyTypeName << "'" << endl;
             return EXIT_FAILURE;
         }
         keyType = l.front();
@@ -397,7 +397,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         l = unit->lookupType(valueTypeName, false);
         if(l.empty())
         {
-            cerr << argv[0] << ": unknown value type `" << valueTypeName << "'" << endl;
+            cerr << appName << ": unknown value type `" << valueTypeName << "'" << endl;
             return EXIT_FAILURE;
         }
         valueType = l.front();
@@ -419,7 +419,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
             ofstream of(outputFile.c_str());
             if(!of.good())
             {
-                cerr << argv[0] << ": unable to open file `" << outputFile << "'" << endl;
+                cerr << appName << ": unable to open file `" << outputFile << "'" << endl;
                 return EXIT_FAILURE;
             }
             of << descriptors << endl;
@@ -543,7 +543,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     }
     catch(const DbException& ex)
     {
-        cerr << argv[0] << ": database error: " << ex.what() << endl;
+        cerr << appName << ": database error: " << ex.what() << endl;
         status = EXIT_FAILURE;
     }
     catch(...)
@@ -558,7 +558,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         }
         catch(const DbException& ex)
         {
-            cerr << argv[0] << ": database error: " << ex.what() << endl;
+            cerr << appName << ": database error: " << ex.what() << endl;
         }
         throw;
     }
@@ -573,7 +573,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     }
     catch(const DbException& ex)
     {
-        cerr << argv[0] << ": database error: " << ex.what() << endl;
+        cerr << appName << ": database error: " << ex.what() << endl;
         status = EXIT_FAILURE;
     }
 
@@ -581,19 +581,23 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 }
 
 int
-main(int argc, char* argv[])
+mainInternal(Ice::StringSeq& args)
 {
+    assert(args.size() > 0);
+    const string appName = args[0];
     Ice::CommunicatorPtr communicator;
     int status = EXIT_SUCCESS;
     try
     {
-        communicator = Ice::initialize(argc, argv);
-        status = run(argc, argv, communicator);
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        communicator = Ice::initialize(args, initData);
+        status = run(args, communicator);
     }
     catch(const FreezeScript::FailureException& ex)
     {
         string reason = ex.reason();
-        cerr << argv[0] << ": " << reason;
+        cerr << appName << ": " << reason;
         if(reason[reason.size() - 1] != '\n')
         {
             cerr << endl;
@@ -602,7 +606,7 @@ main(int argc, char* argv[])
     }
     catch(const IceUtil::Exception& ex)
     {
-        cerr << argv[0] << ": " << ex << endl;
+        cerr << appName << ": " << ex << endl;
         return EXIT_FAILURE;
     }
 
@@ -614,6 +618,22 @@ main(int argc, char* argv[])
     return status;
 }
 
+#ifdef _WIN32
+
+int
+wmain(int argc, wchar_t* argv[])
+
+#else
+
+int
+main(int argc, char* argv[])
+
+#endif
+{
+    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
+    return mainInternal(args);
+}
+
 //
 // SliceVisitor
 //
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 5865a89f6f5..e2b3e07b76a 100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -29,9 +29,8 @@ using namespace std;
 #endif
 
 static void
-usage(const char* n)
+usage(const std::string& n)
 {
- 
     cerr << "Usage:\n";
     cerr << "\n";
     cerr << n << " -o FILE [-i] [slice-options] [type-options]\n";
@@ -212,7 +211,7 @@ transformDb(bool evictor,  const Ice::CommunicatorPtr& communicator,
 }
 
 static int
-run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
+run(Ice::StringSeq args, const Ice::CommunicatorPtr& communicator)
 {
     vector<string> oldCppArgs;
     vector<string> newCppArgs;
@@ -253,24 +252,25 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     opts.addOpt("", "key", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "value", IceUtilInternal::Options::NeedArg);
 
-    vector<string> args;
+    const string appName = args[0];
+    vector<string> noArgs;
     try
     {
 #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
         IceUtil::DummyBCC dummy;
 #endif
-        args = opts.parse(argc, (const char**)argv);
+        noArgs = opts.parse(args);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
-        usage(argv[0]);
+        cerr << appName << ": " << e.reason << endl;
+        usage(appName);
         return EXIT_FAILURE;
     }
 
     if(opts.isSet("help"))
     {
-        usage(argv[0]);
+        usage(appName);
         return EXIT_SUCCESS;
     }
     if(opts.isSet("version"))
@@ -354,77 +354,77 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 
     if(outputFile.empty())
     {
-        if(args.size() == 2)
+        if(noArgs.size() == 2)
         {
             allDb = true;
         }
-        else if(args.size() != 3)
+        else if(noArgs.size() != 3)
         {
-            usage(argv[0]);
+            usage(appName);
             return EXIT_FAILURE;
         }
     }
     else
     {
-        if(args.size() == 1)
+        if(noArgs.size() == 1)
         {
             allDb = true;
         }
-        else if(args.size() != 0)
+        else if(noArgs.size() != 0)
         {
-            usage(argv[0]);
+            usage(appName);
             return EXIT_FAILURE;
         }
     }
 
     if(allDb && (!keyTypeNames.empty() || !valueTypeNames.empty()))
     {
-        usage(argv[0]);
+        usage(appName);
         return EXIT_FAILURE;
     }
 
     if(inputFile.empty() && !allDb && !evictor && (keyTypeNames.empty() || valueTypeNames.empty()))
     {
-        usage(argv[0]);
+        usage(appName);
         return EXIT_FAILURE;
     }
 
-    if(args.size() > 0)
+    if(noArgs.size() > 0)
     {
-        dbEnvName = args[0];
+        dbEnvName = noArgs[0];
     }
-    if(args.size() > 1)
+    if(noArgs.size() > 1)
     {
         if(allDb)
         {
-            dbEnvNameNew = args[1];
+            dbEnvNameNew = noArgs[1];
         }
         else
         {
-            dbName = args[1];
+            dbName = noArgs[1];
         }
     }
-    if(args.size() > 2)
+    if(noArgs.size() > 2)
     {
-        dbEnvNameNew = args[2];
+        dbEnvNameNew = noArgs[2];
     }
-    if(args.size() > 3)
+    if(noArgs.size() > 3)
     {
-        cerr << argv[0] << ": too many arguments" << endl;
-        usage(argv[0]);
+        cerr << appName << ": too many arguments" << endl;
+        usage(appName);
         return EXIT_FAILURE;
     }
 
     Slice::UnitPtr oldUnit = Slice::Unit::createUnit(true, true, ice);
     FreezeScript::Destroyer<Slice::UnitPtr> oldD(oldUnit);
-    if(!FreezeScript::parseSlice(argv[0], oldUnit, oldSlice, oldCppArgs, debug))
+    if(!FreezeScript::parseSlice(appName, oldUnit, oldSlice, oldCppArgs, debug))
     {
         return EXIT_FAILURE;
     }
 
     Slice::UnitPtr newUnit = Slice::Unit::createUnit(true, true, ice);
     FreezeScript::Destroyer<Slice::UnitPtr> newD(newUnit);
-    if(!FreezeScript::parseSlice(argv[0], newUnit, newSlice, newCppArgs, debug))
+    if(!FreezeScript::parseSlice(appName, newUnit, newSlice, newCppArgs, debug))
     {
         return EXIT_FAILURE;
     }
@@ -447,12 +447,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         }
         catch(const FreezeScript::FailureException& ex)
         {
-            cerr << argv[0] << ": " << ex.reason() << endl;
+            cerr << appName << ": " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
         if(catalog.empty())
         {
-            cerr << argv[0] << ": no databases in environment `" << dbEnvName << "'" << endl;
+            cerr << appName << ": no databases in environment `" << dbEnvName << "'" << endl;
             return EXIT_FAILURE;
         }
     }
@@ -499,25 +499,25 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
                 Slice::TypePtr oldKeyType = findType(oldUnit, keyName);
                 if(!oldKeyType)
                 {
-                    cerr << argv[0] << ": type `" << keyName << "' from database `" << p->first
+                    cerr << appName << ": type `" << keyName << "' from database `" << p->first
                          << "' not found in old Slice definitions" << endl;
                 }
                 Slice::TypePtr newKeyType = findType(newUnit, keyName);
                 if(!newKeyType)
                 {
-                    cerr << argv[0] << ": type `" << keyName << "' from database `" << p->first
+                    cerr << appName << ": type `" << keyName << "' from database `" << p->first
                          << "' not found in new Slice definitions" << endl;
                 }
                 Slice::TypePtr oldValueType = findType(oldUnit, valueName);
                 if(!oldValueType)
                 {
-                    cerr << argv[0] << ": type `" << valueName << "' from database `" << p->first
+                    cerr << appName << ": type `" << valueName << "' from database `" << p->first
                          << "' not found in old Slice definitions" << endl;
                 }
                 Slice::TypePtr newValueType = findType(newUnit, valueName);
                 if(!newValueType)
                 {
-                    cerr << argv[0] << ": type `" << valueName << "' from database `" << p->first
+                    cerr << appName << ": type `" << valueName << "' from database `" << p->first
                          << "' not found in new Slice definitions" << endl;
                 }
 
@@ -553,14 +553,14 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 
                 if(keyTypeNames.empty() || valueTypeNames.empty())
                 {
-                    usage(argv[0]);
+                    usage(appName);
                     return EXIT_FAILURE;
                 }
 
                 pos = keyTypeNames.find(',');
                 if(pos == 0 || pos == keyTypeNames.size())
                 {
-                    usage(argv[0]);
+                    usage(appName);
                     return EXIT_FAILURE;
                 }
                 if(pos == string::npos)
@@ -577,7 +577,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
                 pos = valueTypeNames.find(',');
                 if(pos == 0 || pos == valueTypeNames.size())
                 {
-                    usage(argv[0]);
+                    usage(appName);
                     return EXIT_FAILURE;
                 }
                 if(pos == string::npos)
@@ -598,22 +598,22 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
             Slice::TypePtr oldKeyType = findType(oldUnit, oldKeyName);
             if(!oldKeyType)
             {
-                cerr << argv[0] << ": type `" << oldKeyName << "' not found in old Slice definitions" << endl;
+                cerr << appName << ": type `" << oldKeyName << "' not found in old Slice definitions" << endl;
             }
             Slice::TypePtr newKeyType = findType(newUnit, newKeyName);
             if(!newKeyType)
             {
-                cerr << argv[0] << ": type `" << newKeyName << "' not found in new Slice definitions" << endl;
+                cerr << appName << ": type `" << newKeyName << "' not found in new Slice definitions" << endl;
             }
             Slice::TypePtr oldValueType = findType(oldUnit, oldValueName);
             if(!oldValueType)
             {
-                cerr << argv[0] << ": type `" << oldValueName << "' not found in old Slice definitions" << endl;
+                cerr << appName << ": type `" << oldValueName << "' not found in old Slice definitions" << endl;
             }
             Slice::TypePtr newValueType = findType(newUnit, newValueName);
             if(!newValueType)
             {
-                cerr << argv[0] << ": type `" << newValueName << "' not found in new Slice definitions" << endl;
+                cerr << appName << ": type `" << newValueName << "' not found in new Slice definitions" << endl;
             }
 
             //
@@ -633,7 +633,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         {
             for(vector<string>::const_iterator p = analyzeErrors.begin(); p != analyzeErrors.end(); ++p)
             {
-                cerr << argv[0] << ": " << *p << endl;
+                cerr << appName << ": " << *p << endl;
             }
         }
 
@@ -664,7 +664,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
             ofstream of(outputFile.c_str());
             if(!of.good())
             {
-                cerr << argv[0] << ": unable to open file `" << outputFile << "'" << endl;
+                cerr << appName << ": unable to open file `" << outputFile << "'" << endl;
                 return EXIT_FAILURE;
             }
             of << descriptors;
@@ -693,7 +693,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 
     if(dbEnvName == dbEnvNameNew)
     {
-        cerr << argv[0] << ": database environment names must be different" << endl;
+        cerr << appName << ": database environment names must be different" << endl;
         return EXIT_FAILURE;
     }
 
@@ -779,7 +779,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     }
     catch(const DbException& ex)
     {
-        cerr << argv[0] << ": database error: " << ex.what() << endl;
+        cerr << appName << ": database error: " << ex.what() << endl;
         status = EXIT_FAILURE;
     }
     catch(...)
@@ -819,7 +819,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         }
         catch(const DbException& ex)
         {
-            cerr << argv[0] << ": database error: " << ex.what() << endl;
+            cerr << appName << ": database error: " << ex.what() << endl;
         }
         throw;
     }
@@ -851,7 +851,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         }
         catch(const DbException& ex)
         {
-            cerr << argv[0] << ": database error: " << ex.what() << endl;
+            cerr << appName << ": database error: " << ex.what() << endl;
             status = EXIT_FAILURE;
         }
     }
@@ -884,19 +884,23 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 }
 
 int
-main(int argc, char* argv[])
+mainInternal(Ice::StringSeq& args)
 {
+    assert(args.size() > 0);
+    const string appName = args[0];
     Ice::CommunicatorPtr communicator;
     int status = EXIT_SUCCESS;
     try
     {
-        communicator = Ice::initialize(argc, argv);
-        status = run(argc, argv, communicator);
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        communicator = Ice::initialize(args, initData);
+        status = run(args, communicator);
     }
     catch(const FreezeScript::FailureException& ex)
     {
         string reason = ex.reason();
-        cerr << argv[0] << ": " << reason;
+        cerr << appName << ": " << reason;
         if(reason[reason.size() - 1] != '\n')
         {
             cerr << endl;
@@ -905,17 +909,17 @@ main(int argc, char* argv[])
     }
     catch(const IceUtil::Exception& ex)
     {
-        cerr << argv[0] << ": " << ex << endl;
+        cerr << appName << ": " << ex << endl;
         status = EXIT_FAILURE;
     }
     catch(const std::exception& ex)
     {
-        cerr << argv[0] << ": " << ex.what() << endl;
+        cerr << appName << ": " << ex.what() << endl;
         status = EXIT_FAILURE;
     }
     catch(...)
     {
-        cerr << argv[0] << ": unknown exception" << endl;
+        cerr << appName << ": unknown exception" << endl;
         status = EXIT_FAILURE;
     }
 
@@ -926,3 +930,20 @@ main(int argc, char* argv[])
 
     return status;
 }
+
+#ifdef _WIN32
+
+int
+wmain(int argc, wchar_t* argv[])
+
+#else
+
+int
+main(int argc, char* argv[])
+
+#endif
+{
+    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
+    return mainInternal(args);
+}
+