OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen <dam@opencsw.org>

with some changes.

1 files changed, 6 insertions, 3 deletions

diff --git a/unix.c b/unix.c
index 38366111..c3ecbc99 100644
--- a/unix.c
+++ b/unix.c
@@ -158,12 +158,15 @@ int main( int argc, char *argv[] )
 	if( global.restart )
 	{
 		char *fn = ipc_master_save_state();
+		char *env;
 		
-		chdir( old_cwd );
-		
-		setenv( "_BITLBEE_RESTART_STATE", fn, 1 );
+		env = g_strdup_printf( "_BITLBEE_RESTART_STATE=%s", fn );
+		putenv( env );
 		g_free( fn );
+		/* Looks like env should *not* be freed here as putenv
+		   doesn't make a copy. Odd. */
 		
+		chdir( old_cwd );
 		close( global.listen_socket );
 		
 		if( execv( argv[0], argv ) == -1 )