[Libreoffice-commits] .: desktop/unx

[Caolán McNamara]

 desktop/unx/source/args.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f903906471315e525b181e852cbf44fd05174383
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 22 14:27:00 2011 +0000

    You want to fill all arg slots, not overwrite the initial ones

diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index c3b4cb6..0f47f79 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -84,8 +84,10 @@ Args *args_parse (void)
     memset (args, 0, i);
     args->nArgsTotal = nArgs;
 
+    j = 0;
+
     /* sort the -env: args to the front */
-    for ( j = i = 0; i < nArgs; ++i )
+    for ( i = 0; i < nArgs; ++i )
     {
         rtl_uString *pTmp = NULL;
         osl_getCommandArg( i, &pTmp );
@@ -97,7 +99,7 @@ Args *args_parse (void)
     args->nArgsEnv = j;
 
     /* Then the other args */
-    for ( j = i = 0; i < nArgs; ++i )
+    for ( i = 0; i < nArgs; ++i )
     {
         rtl_uString *pTmp = NULL;