Changeset 4eb4c0f for unix.c

Timestamp:

2008-02-16T17:15:31Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in upstream changes

File:

• unix.c (modified) (2 diffs)

unix.c

@@ -48 +48 @@
         
         log_init();
-        CONF_FILE = g_strdup( CONF_FILE_DEF );
+        global.conf_file = g_strdup( CONF_FILE_DEF );
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
@@ -126 +126 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( help_init( &(global.help), global.helpfile ) == NULL )
+        if( help_init( &global.help, global.helpfile ) == NULL )
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
         b_main_run();
+        
+        /* Mainly good for restarting, to make sure we close the help.txt fd. */
+        help_free( &global.help );
         
         if( global.restart )