Update from sibling repository.

1 files changed, 10 insertions, 4 deletions

diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index 006131f727df..6e3af1baca73 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -34,19 +34,25 @@ using namespace ::rtl;
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-    Options options;
+    std::vector< std::string > args;
+    for (int i = 1; i < argc; i++)
+    {
+        if (!Options::checkArgument (args, argv[i], strlen(argv[i])))
+            return (1);
+    }
 
+    Options options(argv[0]);
     try
     {
-        if (!options.initOptions(argc, argv))
-           exit(1);
+        if (!options.initOptions(args))
+           return (0);
     }
     catch( IllegalArgument& e)
     {
         fprintf(stderr, "Illegal argument: %s\n%s",
             e.m_message.getStr(),
             options.prepareVersion().getStr());
-        exit(99);
+        return (99);
     }
 
     setIdlc(&options);