1 files changed, 19 insertions, 143 deletions

diff --git a/source/common.c b/source/common.c
index 4086c7c..fc06ef5 100644
--- a/source/common.c
+++ b/source/common.c
@@ -447,63 +447,6 @@ void Com_Quit( void ) {
 }
 
 
-// ============================================================================
-
-#ifndef DEDICATED_ONLY
-
-/*
-===============
-Com_WriteConfiguration
-
-Writes key bindings and archived cvars to config.cfg
-===============
-*/
-static qboolean Com_WriteConfiguration( const char *path ) {
-	fileHandle_t f;
-
-	FS_FOpenFile( path, &f, FS_MODE_WRITE );
-	if( !f ) {
-		Com_WPrintf( "Couldn't write %s\n", path );
-		return qfalse;
-	}
-
-	FS_FPrintf( f, "// generated by q2pro, do not modify\n" );
-
-	Key_WriteBindings( f );
-	Cvar_WriteVariables( f );
-	
-	FS_FCloseFile( f );
-
-	return qtrue;
-}
-
-/*
-===============
-Com_WriteConfig_f
-===============
-*/
-static void Com_WriteConfig_f( void ) {
-	char buffer[MAX_QPATH];
-
-	if( Cmd_Argc() > 2 ) {
-		Com_Printf( "Usage: %s [cfgfile]\n", Cmd_Argv( 0 ) );
-		return;
-	}
-
-	if( Cmd_Argc() < 2 ) {
-		strcpy( buffer, COM_CONFIG_NAME );
-	} else {
-		Cmd_ArgvBuffer( 1, buffer, sizeof( buffer ) );
-		COM_AppendExtension( buffer, ".cfg", sizeof( buffer ) );
-	}
-
-	if( Com_WriteConfiguration( buffer ) ) {
-		Com_Printf( "Wrote %s\n", buffer );
-	}
-}
-
-#endif
-
 /*
 ==============================================================================
 
@@ -1051,6 +994,24 @@ static void Com_LastError_f( void ) {
 	}
 }
 
+static void Com_Setenv_f( void ) {
+    int argc = Cmd_Argc();
+
+    if( argc > 2 ) {
+        Sys_Setenv( Cmd_Argv( 1 ), Cmd_ArgsFrom( 2 ) );
+    } else if( argc == 2 ) {
+        char *env = getenv( Cmd_Argv( 1 ) );
+
+        if( env ) {
+            Com_Printf( "%s=%s\n", Cmd_Argv( 1 ), env );
+        } else {
+            Com_Printf( "%s undefined\n", Cmd_Argv( 1 ) );
+        }
+    } else {
+        Com_Printf( "Usage: %s <name> [value]\n", Cmd_Argv( 0 ) );
+    }
+}
+
 #ifdef _DEBUG
 
 /*
@@ -1085,88 +1046,12 @@ void Com_Freeze_f( void ) {
 	time = Sys_Milliseconds() + seconds * 1000;
 	while( Sys_Milliseconds() < time )
 		;
-
 }
 
 void Com_Crash_f( void ) {
 	*( uint32 * )0 = 0x123456;
 }
 
-static void Com_VsnprintfTest_f( void ) {
-	char buffer[32];
-	int ret;
-	qboolean fail;
-
-	/* test if returned length is valid, no overflow, large buffer */
-	Com_Printf( "test 1\n" );
-	fail = qfalse;
-	memset( buffer, '@', sizeof( buffer ) );
-	ret = Com_sprintf( buffer, sizeof( buffer ), "%s", "abcd" );
-	if( ret != 4 ) {
-		Com_Printf( "returned %d instead of %d\n", ret, 4 );
-		fail = qtrue;
-	}
-	if( buffer[4] != 0 ) {
-		Com_Printf( "buffer left unterminated\n" );
-		fail = qtrue;
-	}
-	if( buffer[5] != '@' ) {
-		Com_Printf( "buffer overflowed\n" );
-		fail = qtrue;
-	}
-	if( !fail ) {
-		Com_Printf( "succeeded\n" );
-	} else {
-		Com_Printf( "failed\n" );
-	}
-
-	/* test if returned length is valid, no overflow, small buffer */
-	Com_Printf( "test 2\n" );
-	fail = qfalse;
-	memset( buffer, '@', sizeof( buffer ) );
-	ret = Com_sprintf( buffer, 5, "%s", "abcd" );
-	if( ret != 4 ) {
-		Com_Printf( "returned %d instead of %d\n", ret, 4 );
-	}
-	if( buffer[4] != 0 ) {
-		Com_Printf( "buffer left unterminated\n" );
-		fail = qtrue;
-	}
-	if( buffer[5] != '@' ) {
-		Com_Printf( "buffer overflowed\n" );
-		fail = qtrue;
-	}
-	if( !fail ) {
-		Com_Printf( "succeeded\n" );
-	} else {
-		Com_Printf( "failed\n" );
-	}
-
-	/* test if returned length is valid, with overflow */
-	Com_Printf( "test 3\n" );
-	fail = qfalse;
-	memset( buffer, '@', sizeof( buffer ) );
-	ret = Com_sprintf( buffer, 5, "%s", "abcdefgh" );
-	if( ret != 4 ) {
-		Com_Printf( "returned %d instead of %d\n", ret, 4 );
-		fail = qtrue;
-	}
-	if( buffer[4] != 0 ) {
-		Com_Printf( "buffer left unterminated\n" );
-		fail = qtrue;
-	}
-	if( buffer[5] != '@' ) {
-		Com_Printf( "buffer overflowed\n" );
-		fail = qtrue;
-	}
-
-	if( !fail ) {
-		Com_Printf( "succeeded\n" );
-	} else {
-		Com_Printf( "failed\n" );
-	}
-}
-
 #endif
 
 const char *Com_FileNameGenerator( const char *path, const char *ext,
@@ -1388,11 +1273,7 @@ void Qcommon_Init( int argc, char **argv ) {
 
 	Cmd_AddCommand ("z_stats", Z_Stats_f);
 
-#ifndef DEDICATED_ONLY
-	if( !dedicated->integer ) {
-		Cmd_AddCommand( "writeconfig", Com_WriteConfig_f );
-	}
-#endif
+	Cmd_AddCommand( "setenv", Com_Setenv_f );
 
 	Cmd_AddMacro( "com_date", Com_Date_m );
 	Cmd_AddMacro( "com_time", Com_Time_m );
@@ -1648,11 +1529,6 @@ Qcommon_Shutdown
 =================
 */
 void Qcommon_Shutdown( qboolean fatalError ) {
-#ifndef DEDICATED_ONLY
-	if( !fatalError && dedicated && !dedicated->integer ) {
-		Com_WriteConfiguration( COM_CONFIG_NAME );
-	}
-#endif
     NET_Shutdown();
 	LogFile_Close();
 	FS_Shutdown( qtrue );