Changeset 0b510af

Timestamp:

2010-03-16T10:45:26Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a1ac227

Parents:

ec55a7d

Message:

Check the RESTART environment variable before closing fd's 0-2 since the
previous approach broke upgrades to bzr >= 500.

File:

• bitlbee.c (modified) (1 diff)

bitlbee.c

@@ -109 +109 @@
                 chdir( "/" );
                 
-                i = close( 0 ) == 0;
-                i += close( 1 ) == 0;
-                i += close( 2 ) == 0;
-                /* To avoid that something important ends up on one of those
-                   fd's, open them for something bogus. Otherwise RESTART
-                   may cause troubles. */
-                while( i > 0 )
-                {
-                        open( "/dev/null", O_WRONLY );
-                        i --;
-                }
+                if( getenv( "_BITLBEE_RESTART_STATE" ) == NULL )
+                        for( i = 0; i < 3; i ++ )
+                                if( close( i ) == 0 )
+                                {
+                                        /* Keep something bogus on those fd's just in case. */
+                                        open( "/dev/null", O_WRONLY );
+                                }
         }
 #endif