1 files changed, 15 insertions, 3 deletions

diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp
index a579396..271e73d 100644
--- a/noncore/settings/networksettings2/networksettings2/system.cpp
+++ b/noncore/settings/networksettings2/networksettings2/system.cpp
@@ -369,49 +369,61 @@ void System::execAsUser( QString & Cmd, char * argv[] ) {
 
       char ** envp = (char **)alloca( sizeof( char *) *
             (CU.EnvList.count()+1) );
 
       for( unsigned int i = 0 ; i < CU.EnvList.count() ; i ++ ) {
         *(envp+i) = CU.EnvList[i];
       }
       envp[CU.EnvList.count()]=NULL;
 
       execve( Cmd.latin1(), argv, envp );
 
       // if we come here, the exec was not successfull
       Log(("Could not exec : %d\n", errno ));
 }
 
 #include <stdarg.h>
 static FILE * logf = 0;
 
 void VLog( char * Format, ... ) {
       va_list l;
 
       va_start(l, Format );
 
       if( logf == (FILE *)0 ) {
-        // logf = fopen( "/tmp/ns2log", "a" );
-        logf = stderr;
+        if( getenv("NS2STDERR") ) {
+          logf = stderr;
+        } else {
+          logf = fopen( "/tmp/ns2log", "a" );
+        }
         if( ! logf ) {
           fprintf( stderr, "Cannot open logfile /tmp/ns2log %d\n", 
               errno );
           logf = (FILE *)1;
         } else {
           fprintf( logf, "____ OPEN LOGFILE ____\n");
         }
       }
 
       if( (long)logf > 1 ) {
         vfprintf( logf, Format, l );
       }
       va_end( l );
 
 }
 
 void LogClose( void ) {
       if( (long)logf > 1 ) {
         fprintf( logf, "____ CLOSE LOGFILE ____\n");
-        fclose( logf );
+        if( logf != stderr ) {
+          fclose( logf );
+        }
         logf = 0;
       }
 }
+
+QString removeSpaces( const QString & X ) {
+      QStringList SL;
+
+      SL = QStringList::split( " ", X );
+      return SL.join( "_" );
+}