Still no need for osl_setCommandArgs

(TOCTOU and all)

Change-Id: I81253c8790b631117634bafa4eea65991a975ba0

desktop/source/lib/init.cxx

@@ -693,11 +693,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
         // again (as an assert will fire), this will be the case e.g.
         // for unit tests (and possibly if UNO is being used in addition
         // to LOK in an external program).
-        if (!osl_areCommandArgsSet())
-        {
-            SAL_INFO("lok", "commandArgs not previously set");
-            osl_setCommandArgs(2, pArgs);
-        }
+        osl_setCommandArgs(2, pArgs);
         SAL_INFO("lok", "attempting to initalize UNO");
         initialize_uno(aAppURL);
         SAL_INFO("lok", "uno successfully initalized");

sal/osl/unx/process_impl.cxx

@@ -205,7 +205,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
 {
     assert(argc > 0);
     pthread_mutex_lock (&(g_command_args.m_mutex));
-    assert (g_command_args.m_nCount == 0);
+    SAL_WARN_IF(g_command_args.m_nCount != 0, "sal.osl", "args already set");
     if (g_command_args.m_nCount == 0)
     {
         rtl_uString** ppArgs = (rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*));

sal/osl/w32/process.cxx

@@ -374,6 +374,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
 {
     assert(argc > 0);
     osl_acquireMutex (*osl_getGlobalMutex());
+    SAL_WARN_IF(g_command_args.m_nCount != 0, "sal.osl", "args already set");
     if (g_command_args.m_nCount == 0)
     {
         rtl_uString** ppArgs = osl_createCommandArgs_Impl (argc, argv);