Changeset c227706

Timestamp:

2006-12-24T19:35:13Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

7bee5af

Parents:

9225e08

Message:

Refactor the help code to take a filename rather than using the global struct.

Files:

• help.c (modified) (3 diffs)
• help.h (modified) (1 diff)
• tests/Makefile (modified) (1 diff)
• tests/check.c (modified) (2 diffs)
• tests/check_help.c (added)
• unix.c (modified) (1 diff)

help.c

@@ -31 +31 @@
 #define BUFSIZE 1100
 
-help_t *help_init( help_t **help )
+help_t *help_init( help_t **help, const char *helpfile )
 {
         int i, buflen = 0;
@@ -41 +41 @@
         *help = h = g_new0 ( help_t, 1 );
         
-        h->fd = open( global.helpfile, O_RDONLY
+        h->fd = open( helpfile, O_RDONLY
 #ifdef _WIN32
                                   | O_BINARY
@@ -109 +109 @@
         help_t *h;
 
-        h=*help;        
-
-        while( h )
+        for( h = *help; h; h = h->next )
         {
-                if( g_strcasecmp( h->string, string ) == 0 ) break;
-                h = h->next;
+                if( h->string != NULL && 
+                        g_strcasecmp( h->string, string ) == 0 ) 
+                        break;
         }
         if( h && h->length > 0 )

help.h

@@ -43 +43 @@
 } help_t;
 
-help_t *help_init( help_t **help );
+help_t *help_init( help_t **help, const char *helpfile );
 char *help_get( help_t **help, char *string );
 

tests/Makefile

@@ -11 +11 @@
 main_objs = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o storage_text.o user.o 
 
-test_objs = check.o check_util.o check_nick.o check_md5.o check_irc.o
+test_objs = check.o check_util.o check_nick.o check_md5.o check_irc.o check_help.o
 
 check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o

tests/check.c

@@ -41 +41 @@
 Suite *irc_suite(void);
 
+/* From check_help.c */
+Suite *help_suite(void);
+
 int main (int argc, char **argv)
 {
@@ -81 +84 @@
         srunner_add_suite(sr, md5_suite());
         srunner_add_suite(sr, irc_suite());
+        srunner_add_suite(sr, help_suite());
         if (no_fork)
                 srunner_set_fork_status(sr, CK_NOFORK);

unix.c

@@ -112 +112 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( help_init( &(global.help) ) == NULL )
+        if( help_init( &(global.help), global.helpfile ) == NULL )
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );