bug 1831 - changed demos as well to warn about extra arguments

54 files changed, 323 insertions, 2 deletions

diff --git a/cpp/demo/Database/Oracle/occi/Client.cpp b/cpp/demo/Database/Oracle/occi/Client.cpp
index 569fdf620fc..d0501a5c9e4 100644
--- a/cpp/demo/Database/Oracle/occi/Client.cpp
+++ b/cpp/demo/Database/Oracle/occi/Client.cpp
@@ -159,6 +159,12 @@ HRClient::help() const
 int
 HRClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectPrx base = communicator()->propertyToProxy("HR.DeptFactory");
     _factory = DeptFactoryPrx::checkedCast(base);
     if(_factory == 0)
diff --git a/cpp/demo/Database/Oracle/occi/Server.cpp b/cpp/demo/Database/Oracle/occi/Server.cpp
index c9ae7f42d0b..461f1b3de0c 100644
--- a/cpp/demo/Database/Oracle/occi/Server.cpp
+++ b/cpp/demo/Database/Oracle/occi/Server.cpp
@@ -33,6 +33,12 @@ main(int argc, char* argv[])
 int
 HRServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     const string username = communicator()->getProperties()->getPropertyWithDefault("Oracle.Username", "scott");
     const string password = communicator()->getProperties()->getPropertyWithDefault("Oracle.Password", "password");
     const string connectString = communicator()->getProperties()->getProperty("Oracle.ConnectString");
diff --git a/cpp/demo/Database/Oracle/proc/Client.cpp b/cpp/demo/Database/Oracle/proc/Client.cpp
index 569fdf620fc..d0501a5c9e4 100644
--- a/cpp/demo/Database/Oracle/proc/Client.cpp
+++ b/cpp/demo/Database/Oracle/proc/Client.cpp
@@ -159,6 +159,12 @@ HRClient::help() const
 int
 HRClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectPrx base = communicator()->propertyToProxy("HR.DeptFactory");
     _factory = DeptFactoryPrx::checkedCast(base);
     if(_factory == 0)
diff --git a/cpp/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp
index 2c49ab7750a..81c69701b78 100644
--- a/cpp/demo/Freeze/backup/Client.cpp
+++ b/cpp/demo/Freeze/backup/Client.cpp
@@ -31,6 +31,11 @@ main(int argc, char* argv[])
     initData.properties->load("config");
 
     Ice::CommunicatorPtr communicator = Ice::initialize(argc, argv, initData);
+    if(argc > 1)
+    {
+        cerr << argv[0] << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
 
     Freeze::ConnectionPtr connection = Freeze::createConnection(communicator, "backup");
     IntLongMap m(connection, "IntLongMap", true);
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 916e9938c48..e1ec5b2014e 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -718,6 +718,12 @@ typedef IceUtil::Handle<MyFactory> MyFactoryPtr;
 int
 TestApp::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Freeze/casino/Client.cpp b/cpp/demo/Freeze/casino/Client.cpp
index 0e219fc25b3..9c13546750e 100644
--- a/cpp/demo/Freeze/casino/Client.cpp
+++ b/cpp/demo/Freeze/casino/Client.cpp
@@ -31,8 +31,13 @@ main(int argc, char* argv[])
 
 int
 CasinoClient::run(int argc, char* argv[])
-
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     cout << "Retrieve bank and players... " << flush;
 
     Casino::BankPrx bank = Casino::BankPrx::uncheckedCast(communicator()->propertyToProxy("Bank.Proxy"));
diff --git a/cpp/demo/Freeze/casino/Server.cpp b/cpp/demo/Freeze/casino/Server.cpp
index d43d0bbce18..c515a26609c 100644
--- a/cpp/demo/Freeze/casino/Server.cpp
+++ b/cpp/demo/Freeze/casino/Server.cpp
@@ -73,6 +73,12 @@ public:
 int
 CasinoServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     _bankEdge = properties->getPropertyAsInt("Bank.Edge");
diff --git a/cpp/demo/Freeze/customEvictor/Client.cpp b/cpp/demo/Freeze/customEvictor/Client.cpp
index 45c0ddae829..66c3b804bdf 100644
--- a/cpp/demo/Freeze/customEvictor/Client.cpp
+++ b/cpp/demo/Freeze/customEvictor/Client.cpp
@@ -140,6 +140,12 @@ typedef IceUtil::Handle<WriterThread> WriterThreadPtr;
 int
 WarehouseClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Retrieve a proxy to one item (any item will do).
     //
diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp
index f7e729422f8..35bc9831c0b 100644
--- a/cpp/demo/Freeze/library/Server.cpp
+++ b/cpp/demo/Freeze/library/Server.cpp
@@ -39,6 +39,12 @@ main(int argc, char* argv[])
 int
 LibraryServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     //
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index a86f334225d..c6a69e0658d 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -40,6 +40,12 @@ main(int argc, char* argv[])
 int
 PhoneBookServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
     
     //
diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index baf24c50747..e37e899c472 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -48,6 +48,12 @@ menu()
 int
 CallbackClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Glacier2/callback/Server.cpp b/cpp/demo/Glacier2/callback/Server.cpp
index e87ea8d51cd..27378592325 100644
--- a/cpp/demo/Glacier2/callback/Server.cpp
+++ b/cpp/demo/Glacier2/callback/Server.cpp
@@ -30,6 +30,12 @@ main(int argc, char* argv[])
 int
 CallbackServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server");
     adapter->add(new CallbackI, communicator()->stringToIdentity("callback"));
     adapter->activate();
diff --git a/cpp/demo/Glacier2/callback/SessionServer.cpp b/cpp/demo/Glacier2/callback/SessionServer.cpp
index 9a1a8b42603..87616b82bda 100644
--- a/cpp/demo/Glacier2/callback/SessionServer.cpp
+++ b/cpp/demo/Glacier2/callback/SessionServer.cpp
@@ -29,6 +29,12 @@ main(int argc, char* argv[])
 int
 SessionServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionServer");
     adapter->add(new DummyPermissionsVerifierI, communicator()->stringToIdentity("verifier"));
     adapter->add(new SessionManagerI, communicator()->stringToIdentity("sessionmanager"));
diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp
index 3f56a9845f4..75aeac9e946 100755
--- a/cpp/demo/Glacier2/chat/Client.cpp
+++ b/cpp/demo/Glacier2/chat/Client.cpp
@@ -94,6 +94,12 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
+        if(argc > 1)
+        {
+            cerr << appName() << ": too many arguments" << endl;
+            return EXIT_FAILURE;
+        }
+
         //
         // Since this is an interactive demo we want the custom interrupt
         // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Glacier2/chat/Server.cpp b/cpp/demo/Glacier2/chat/Server.cpp
index df7d382e3ab..2e6bf28d926 100755
--- a/cpp/demo/Glacier2/chat/Server.cpp
+++ b/cpp/demo/Glacier2/chat/Server.cpp
@@ -30,8 +30,14 @@ class ChatServer : public Ice::Application
 public:
 
     virtual int
-    run(int, char*[])
+    run(int argc, char* argv[])
     {
+        if(argc > 1)
+        {
+            cerr << appName() << ": too many arguments" << endl;
+            return EXIT_FAILURE;
+        }
+
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("ChatServer");
         
         adapter->add(new ChatSessionManagerI, communicator()->stringToIdentity("ChatSessionManager"));
diff --git a/cpp/demo/Ice/async/Client.cpp b/cpp/demo/Ice/async/Client.cpp
index 41d0ce37b8f..ae0f8127b00 100644
--- a/cpp/demo/Ice/async/Client.cpp
+++ b/cpp/demo/Ice/async/Client.cpp
@@ -49,6 +49,12 @@ main(int argc, char* argv[])
 int
 AsyncClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     callbackOnInterrupt();
 
     HelloPrx hello = HelloPrx::checkedCast(communicator()->propertyToProxy("Hello.Proxy"));
diff --git a/cpp/demo/Ice/async/Server.cpp b/cpp/demo/Ice/async/Server.cpp
index 86e9f3ef0c1..960a9021639 100644
--- a/cpp/demo/Ice/async/Server.cpp
+++ b/cpp/demo/Ice/async/Server.cpp
@@ -35,6 +35,12 @@ main(int argc, char* argv[])
 int
 AsyncServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     callbackOnInterrupt();
 
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp
index af4d074ae19..83e10d076db 100644
--- a/cpp/demo/Ice/bidir/Client.cpp
+++ b/cpp/demo/Ice/bidir/Client.cpp
@@ -42,6 +42,12 @@ main(int argc, char* argv[])
 int
 CallbackClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     CallbackSenderPrx server = 
         CallbackSenderPrx::checkedCast(communicator()->propertyToProxy("Callback.Client.CallbackServer"));
     if(!server)
diff --git a/cpp/demo/Ice/bidir/Server.cpp b/cpp/demo/Ice/bidir/Server.cpp
index a9be1e67ced..e027eb97184 100644
--- a/cpp/demo/Ice/bidir/Server.cpp
+++ b/cpp/demo/Ice/bidir/Server.cpp
@@ -30,6 +30,12 @@ main(int argc, char* argv[])
 int
 CallbackServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server");
     CallbackSenderIPtr sender = new CallbackSenderI(communicator());
     adapter->add(sender, communicator()->stringToIdentity("sender"));
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index 86d0ddc8633..51e1ac627f0 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -55,6 +55,12 @@ main(int argc, char* argv[])
 int
 CallbackClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp
index 4ed8704cf33..86e99772f15 100644
--- a/cpp/demo/Ice/callback/Server.cpp
+++ b/cpp/demo/Ice/callback/Server.cpp
@@ -30,6 +30,12 @@ main(int argc, char* argv[])
 int
 CallbackServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server");
     adapter->add(new CallbackSenderI, communicator()->stringToIdentity("callback"));
     adapter->activate();
diff --git a/cpp/demo/Ice/converter/Client.cpp b/cpp/demo/Ice/converter/Client.cpp
index 1632fbd6713..a0f27f15462 100644
--- a/cpp/demo/Ice/converter/Client.cpp
+++ b/cpp/demo/Ice/converter/Client.cpp
@@ -30,6 +30,12 @@ menu()
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator1, const Ice::CommunicatorPtr& communicator2)
 {
+    if(argc > 1)
+    {
+        cerr << argv[0] << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     const string proxyProperty = "Echo.Proxy";
     EchoPrx echo1 = EchoPrx::checkedCast(communicator1->propertyToProxy(proxyProperty));
     if(!echo1)
diff --git a/cpp/demo/Ice/converter/Server.cpp b/cpp/demo/Ice/converter/Server.cpp
index 6b8b34e7f8a..909881a6df6 100644
--- a/cpp/demo/Ice/converter/Server.cpp
+++ b/cpp/demo/Ice/converter/Server.cpp
@@ -29,6 +29,12 @@ main(int argc, char* argv[])
 int
 EchoServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Echo");
     adapter->add(new EchoI, communicator()->stringToIdentity("echo"));
     adapter->activate();
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index dbf877722d9..1620c93f7c0 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -35,6 +35,12 @@ main(int argc, char* argv[])
 int
 HelloClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp
index 55ebb19bafb..b802ef77f4b 100644
--- a/cpp/demo/Ice/hello/Server.cpp
+++ b/cpp/demo/Ice/hello/Server.cpp
@@ -29,6 +29,12 @@ main(int argc, char* argv[])
 int
 HelloServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     adapter->add(new HelloI, communicator()->stringToIdentity("hello"));
     adapter->activate();
diff --git a/cpp/demo/Ice/invoke/Client.cpp b/cpp/demo/Ice/invoke/Client.cpp
index ebaa4c59d40..37200231d12 100644
--- a/cpp/demo/Ice/invoke/Client.cpp
+++ b/cpp/demo/Ice/invoke/Client.cpp
@@ -53,6 +53,12 @@ operator<<(ostream& out, Demo::Color c)
 int
 InvokeClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Ice/invoke/Server.cpp b/cpp/demo/Ice/invoke/Server.cpp
index 19d4ce49db9..f52ee443f20 100644
--- a/cpp/demo/Ice/invoke/Server.cpp
+++ b/cpp/demo/Ice/invoke/Server.cpp
@@ -29,6 +29,12 @@ main(int argc, char* argv[])
 int
 InvokeServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Printer");
     adapter->add(new PrinterI, communicator()->stringToIdentity("printer"));
     adapter->activate();
diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp
index f479159a5e7..ce5cae636d1 100644
--- a/cpp/demo/Ice/latency/Client.cpp
+++ b/cpp/demo/Ice/latency/Client.cpp
@@ -30,6 +30,12 @@ main(int argc, char* argv[])
 int
 LatencyClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectPrx base = communicator()->propertyToProxy("Latency.Ping");
     PingPrx ping = PingPrx::checkedCast(base);
     if(!ping)
diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp
index 661d4546285..42ca2801af0 100644
--- a/cpp/demo/Ice/latency/Server.cpp
+++ b/cpp/demo/Ice/latency/Server.cpp
@@ -30,6 +30,12 @@ main(int argc, char* argv[])
 int
 LatencyServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Latency");
     Ice::ObjectPtr object = new Ping;
     adapter->add(new Ping, communicator()->stringToIdentity("ping"));
diff --git a/cpp/demo/Ice/minimal/Client.cpp b/cpp/demo/Ice/minimal/Client.cpp
index 583379642ef..e585d82bb74 100644
--- a/cpp/demo/Ice/minimal/Client.cpp
+++ b/cpp/demo/Ice/minimal/Client.cpp
@@ -22,6 +22,11 @@ main(int argc, char* argv[])
     try
     {
         communicator = Ice::initialize(argc, argv);
+        if(argc > 1)
+        {
+            cerr << argv[0] << ": too many arguments" << endl;
+            return EXIT_FAILURE;
+        }
         HelloPrx hello = HelloPrx::checkedCast(communicator->stringToProxy("hello:tcp -p 10000"));
         if(!hello)
         {
diff --git a/cpp/demo/Ice/minimal/Server.cpp b/cpp/demo/Ice/minimal/Server.cpp
index 7446f6fefa4..d1fb9a2c56e 100644
--- a/cpp/demo/Ice/minimal/Server.cpp
+++ b/cpp/demo/Ice/minimal/Server.cpp
@@ -43,6 +43,11 @@ main(int argc, char* argv[])
     try
     {
         communicator = Ice::initialize(argc, argv);
+        if(argc > 1)
+        {
+            cerr << argv[0] << ": too many arguments" << endl;
+            return EXIT_FAILURE;
+        }
         Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("Hello", "tcp -p 10000");
         adapter->add(new HelloI, communicator->stringToIdentity("hello"));
         adapter->activate();
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index 54cb2291601..ee847b59b99 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -32,6 +32,12 @@ main(int argc, char* argv[])
 int
 NestedClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index 55e94593fdd..66e6e1d1f40 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -30,6 +30,12 @@ main(int argc, char* argv[])
 int
 NestedServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Nested.Server");
     NestedPrx self = NestedPrx::uncheckedCast(adapter->createProxy(communicator()->stringToIdentity("nestedServer")));
     adapter->add(new NestedI(self), communicator()->stringToIdentity("nestedServer"));
diff --git a/cpp/demo/Ice/session/Client.cpp b/cpp/demo/Ice/session/Client.cpp
index c8cf00f4d87..0918c345d5b 100755
--- a/cpp/demo/Ice/session/Client.cpp
+++ b/cpp/demo/Ice/session/Client.cpp
@@ -104,6 +104,12 @@ main(int argc, char* argv[])
 int
 SessionClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Ice/session/Server.cpp b/cpp/demo/Ice/session/Server.cpp
index 26fac7a72fe..6480d8aa433 100644
--- a/cpp/demo/Ice/session/Server.cpp
+++ b/cpp/demo/Ice/session/Server.cpp
@@ -29,6 +29,12 @@ main(int argc, char* argv[])
 int
 SessionServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionFactory");
 
     ReapThreadPtr reaper = new ReapThread();
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index 6b7bb071aaa..82a3e621e69 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -37,6 +37,12 @@ main(int argc, char* argv[])
 int
 ThroughputClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp
index d48074ef88f..efe336cb22b 100644
--- a/cpp/demo/Ice/throughput/Server.cpp
+++ b/cpp/demo/Ice/throughput/Server.cpp
@@ -29,6 +29,12 @@ main(int argc, char* argv[])
 int
 ThroughputServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Throughput");
     adapter->add(new ThroughputI, communicator()->stringToIdentity("throughput"));
     adapter->activate();
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index e37a48aa349..b8278e40d36 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -32,6 +32,12 @@ main(int argc, char* argv[])
 int
 ValueClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp
index a7e51791c21..7ef649c1a05 100644
--- a/cpp/demo/Ice/value/Server.cpp
+++ b/cpp/demo/Ice/value/Server.cpp
@@ -29,6 +29,12 @@ main(int argc, char* argv[])
 int
 ValueServer::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Value");
     adapter->add(new InitialI(adapter), communicator()->stringToIdentity("initial"));
     adapter->activate();
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index 4b879387b9d..f7e9e331cd8 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -51,6 +51,12 @@ HelloClient::menu()
 int
 HelloClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp
index 1ef1098d320..0931f7be051 100644
--- a/cpp/demo/IceGrid/allocate/Client.cpp
+++ b/cpp/demo/IceGrid/allocate/Client.cpp
@@ -93,6 +93,12 @@ main(int argc, char* argv[])
 int
 HelloClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     int status = EXIT_SUCCESS;
 
     //
diff --git a/cpp/demo/IceGrid/allocate/Server.cpp b/cpp/demo/IceGrid/allocate/Server.cpp
index c28d440de70..a2a578e2b5e 100644
--- a/cpp/demo/IceGrid/allocate/Server.cpp
+++ b/cpp/demo/IceGrid/allocate/Server.cpp
@@ -31,6 +31,12 @@ main(int argc, char* argv[])
 int
 Server::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
diff --git a/cpp/demo/IceGrid/replication/Client.cpp b/cpp/demo/IceGrid/replication/Client.cpp
index 12d8f4634a1..1596e19c6b0 100644
--- a/cpp/demo/IceGrid/replication/Client.cpp
+++ b/cpp/demo/IceGrid/replication/Client.cpp
@@ -37,6 +37,12 @@ main(int argc, char* argv[])
 int
 HelloClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/IceGrid/replication/Server.cpp b/cpp/demo/IceGrid/replication/Server.cpp
index c28d440de70..a2a578e2b5e 100644
--- a/cpp/demo/IceGrid/replication/Server.cpp
+++ b/cpp/demo/IceGrid/replication/Server.cpp
@@ -31,6 +31,12 @@ main(int argc, char* argv[])
 int
 Server::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
diff --git a/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp
index 7fe2f6a2283..bfbd01497c4 100644
--- a/cpp/demo/IceGrid/sessionActivation/Client.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp
@@ -93,6 +93,12 @@ main(int argc, char* argv[])
 int
 HelloClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     int status = EXIT_SUCCESS;
 
     //
diff --git a/cpp/demo/IceGrid/sessionActivation/Server.cpp b/cpp/demo/IceGrid/sessionActivation/Server.cpp
index c28d440de70..a2a578e2b5e 100644
--- a/cpp/demo/IceGrid/sessionActivation/Server.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Server.cpp
@@ -31,6 +31,12 @@ main(int argc, char* argv[])
 int
 Server::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp
index 5528bdad6b7..c865ef4d239 100644
--- a/cpp/demo/IceGrid/simple/Client.cpp
+++ b/cpp/demo/IceGrid/simple/Client.cpp
@@ -47,6 +47,12 @@ HelloClient::menu()
 int
 HelloClient::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     //
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
diff --git a/cpp/demo/IceGrid/simple/Server.cpp b/cpp/demo/IceGrid/simple/Server.cpp
index c28d440de70..a2a578e2b5e 100644
--- a/cpp/demo/IceGrid/simple/Server.cpp
+++ b/cpp/demo/IceGrid/simple/Server.cpp
@@ -31,6 +31,12 @@ main(int argc, char* argv[])
 int
 Server::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp
index 3ebe93ed502..bebf2b72b76 100644
--- a/cpp/demo/IceStorm/clock/Publisher.cpp
+++ b/cpp/demo/IceStorm/clock/Publisher.cpp
@@ -52,6 +52,13 @@ Publisher::run(int argc, char* argv[])
     catch(const IceUtil::BadOptException& e)
     {
         cerr << argv[0] << ": " << e.reason << endl;
+        usage(appName());
+        return EXIT_FAILURE;
+    }
+    if(remaining.size() > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        usage(appName());
         return EXIT_FAILURE;
     }
 
diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp
index dd520822900..9b757574841 100644
--- a/cpp/demo/IceStorm/clock/Subscriber.cpp
+++ b/cpp/demo/IceStorm/clock/Subscriber.cpp
@@ -70,6 +70,12 @@ Subscriber::run(int argc, char* argv[])
         usage(appName());
         return EXIT_FAILURE;
     }
+    if(remaining.size() > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        usage(appName());
+        return EXIT_FAILURE;
+    }
 
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(
         communicator()->propertyToProxy("IceStorm.TopicManager.Proxy"));
diff --git a/cpp/demo/IceStorm/counter/Client.cpp b/cpp/demo/IceStorm/counter/Client.cpp
index 8e68c5e8ba0..1c683e1c95c 100644
--- a/cpp/demo/IceStorm/counter/Client.cpp
+++ b/cpp/demo/IceStorm/counter/Client.cpp
@@ -34,6 +34,12 @@ main(int argc, char* argv[])
 int
 Client::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     const string proxyProperty = "Counter.Proxy";
diff --git a/cpp/demo/IceStorm/counter/Server.cpp b/cpp/demo/IceStorm/counter/Server.cpp
index 58a3dd64824..e0a88ba157b 100644
--- a/cpp/demo/IceStorm/counter/Server.cpp
+++ b/cpp/demo/IceStorm/counter/Server.cpp
@@ -34,6 +34,12 @@ main(int argc, char* argv[])
 int
 Server::run(int argc, char* argv[])
 {
+    if(argc > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     const string proxyProperty = "IceStorm.TopicManager.Proxy";
diff --git a/cpp/demo/IceStorm/replicated/Publisher.cpp b/cpp/demo/IceStorm/replicated/Publisher.cpp
index b128421d38b..a66737882b8 100644
--- a/cpp/demo/IceStorm/replicated/Publisher.cpp
+++ b/cpp/demo/IceStorm/replicated/Publisher.cpp
@@ -34,6 +34,12 @@ main(int argc, char* argv[])
 int
 Publisher::run(int argc, char* argv[])
 {
+    if(argc > 2)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     IceStorm::TopicManagerPrx manager = 
diff --git a/cpp/demo/IceStorm/replicated/Subscriber.cpp b/cpp/demo/IceStorm/replicated/Subscriber.cpp
index 839e8e40aca..34d036052f0 100644
--- a/cpp/demo/IceStorm/replicated/Subscriber.cpp
+++ b/cpp/demo/IceStorm/replicated/Subscriber.cpp
@@ -160,6 +160,12 @@ main(int argc, char* argv[])
 int
 Subscriber::run(int argc, char* argv[])
 {
+    if(argc > 2)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        return EXIT_FAILURE;
+    }
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     IceGrid::QueryPrx query = IceGrid::QueryPrx::uncheckedCast(communicator()->stringToProxy("DemoIceGrid/Query"));