Changeset 0fbda193

Timestamp:

2008-02-02T21:48:09Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

979cfb4

Parents:

f774e01

Message:

Added help_free() and cleaned up some very stale help-related stuff I
wasn't even aware of. This closes bug #352.

Files:

• help.c (modified) (4 diffs)
• help.h (modified) (2 diffs)
• irc.c (modified) (2 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• unix.c (modified) (1 diff)

help.c

@@ -71 +71 @@
                 {
                         /* FIXME: Clean up */
-//                      help_close( *help );
-                        *help = NULL;
+                        help_free( help );
                         g_free( s );
-                        return( NULL );
+                        return NULL;
                 }
                 i = strchr( s, '\n' ) - s;
                 
-                if( h->string )
+                if( h->title )
                 {
                         h = h->next = g_new0( help_t, 1 );
                 }
-                h->string = g_new ( char, i );
+                h->title = g_new ( char, i );
                 
-                strncpy( h->string, s + 1, i - 1 );
-                h->string[i-1] = 0;
+                strncpy( h->title, s + 1, i - 1 );
+                h->title[i-1] = 0;
                 h->fd = (*help)->fd;
                 h->offset.file_offset = lseek( h->fd, 0, SEEK_CUR ) - buflen + i + 1;
@@ -103 +102 @@
 }
 
-char *help_get( help_t **help, char *string )
+void help_free( help_t **help )
+{
+        help_t *h, *oh;
+        int last_fd = -1; /* Weak de-dupe */
+        
+        if( help == NULL || *help == NULL )
+                return;
+        
+        h = *help;
+        while( h )
+        {
+                if( h->fd != last_fd )
+                {
+                        close( h->fd );
+                        last_fd = h->fd;
+                }
+                g_free( h->title );
+                h = (oh=h)->next;
+                g_free( oh );
+        }
+        
+        *help = NULL;
+}
+
+char *help_get( help_t **help, char *title )
 {
         time_t mtime;
@@ -111 +134 @@
         for( h = *help; h; h = h->next )
         {
-                if( h->string != NULL && 
-                        g_strcasecmp( h->string, string ) == 0 ) 
+                if( h->title != NULL && g_strcasecmp( h->title, title ) == 0 )
                         break;
         }
@@ -119 +141 @@
                 char *s = g_new( char, h->length + 1 );
                 
-                if( fstat( h->fd, stat ) != 0 )
-                {
-                        g_free( h );
-                        *help = NULL;
-                        return NULL;
-                }
-                mtime = stat->st_mtime;
-                
-                if( mtime > h->mtime )
-                        return NULL;
-                
                 s[h->length] = 0;
                 if( h->fd >= 0 )
                 {
+                        if( fstat( h->fd, stat ) != 0 )
+                        {
+                                g_free( s );
+                                return NULL;
+                        }
+                        mtime = stat->st_mtime;
+                
+                        if( mtime > h->mtime )
+                        {
+                                g_free( s );
+                                return NULL;
+                        }
+                        
                         lseek( h->fd, h->offset.file_offset, SEEK_SET );
                         read( h->fd, s, h->length );

help.h

@@ -37 +37 @@
         int fd;
         time_t mtime;
-        char *string;
+        char *title;
         help_off_t offset;
         int length;
@@ -44 +44 @@
 
 G_GNUC_MALLOC help_t *help_init( help_t **help, const char *helpfile );
-char *help_get( help_t **help, char *string );
+void help_free( help_t **help );
+char *help_get( help_t **help, char *title );
 
 #endif

irc.c

@@ -189 +189 @@
         account_t *account;
         user_t *user, *usertmp;
-        help_t *helpnode, *helpnodetmp;
         
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
@@ -266 +265 @@
         g_hash_table_destroy(irc->watches);
         
-        if (irc->help != NULL) {
-                helpnode = irc->help;
-                while (helpnode != NULL) {
-                        g_free(helpnode->string);
-                        
-                        helpnodetmp = helpnode;
-                        helpnode = helpnode->next;
-                        g_free(helpnodetmp);
-                }
-        }
         g_free(irc);
         

irc.h

@@ -89 +89 @@
         GHashTable *watches;
         struct __NICK *nicks;
-        struct help *help;
         struct set *set;
 

irc_commands.c

@@ -556 +556 @@
         
         for( h = global.help; h; h = h->next )
-                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS help ", h->string );
+                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS help ", h->title );
         
         for( s = irc->set; s; s = s->next )

unix.c

@@ -124 +124 @@
         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 )