From c876a8c9db773cccaf4da87a7a30d95bff0e42d9 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam@opencsw.org>
Date: Fri, 6 Aug 2010 15:32:10 +0200
Subject: [PATCH 2/6] Use putenv instead of setenv
---
conf.c | 6 ++++++
unix.c | 6 ++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/conf.c b/conf.c
index 337d0cf..21802b8 100644
a
|
b
|
conf_t *conf_load( int argc, char *argv[] ) |
159 | 159 | /* Backward compatibility; older BitlBees passed this |
160 | 160 | info using a command-line flag. Allow people to |
161 | 161 | upgrade from such a version for now. */ |
| 162 | #if(__sun) |
| 163 | char dummy[100]; |
| 164 | g_snprintf( dummy, sizeof( dummy ), "_BITLBEE_RESTART_STATE=%s", optarg ); |
| 165 | putenv( dummy ); |
| 166 | #else |
162 | 167 | setenv( "_BITLBEE_RESTART_STATE", optarg, 0 ); |
| 168 | #endif |
163 | 169 | } |
164 | 170 | else if( opt == 'u' ) |
165 | 171 | { |
diff --git a/unix.c b/unix.c
index d58395a..fbf64ef 100644
a
|
b
|
int main( int argc, char *argv[] ) |
155 | 155 | |
156 | 156 | chdir( old_cwd ); |
157 | 157 | |
| 158 | #if(__sun) |
| 159 | char dummy[100]; |
| 160 | g_snprintf( dummy, sizeof( dummy ), "_BITLBEE_RESTART_STATE=%s", fn ); |
| 161 | putenv( dummy ); |
| 162 | #else |
158 | 163 | setenv( "_BITLBEE_RESTART_STATE", fn, 1 ); |
| 164 | #endif |
159 | 165 | g_free( fn ); |
160 | 166 | |
161 | 167 | close( global.listen_socket ); |