Changeset ae3c4fa for help.c

Timestamp:

2007-07-01T14:52:45Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

19a8088

Parents:

f7b44f2 (diff), 348c11b (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 from Jelmer (mainly unit testing things).

File:

• help.c (modified) (3 diffs)

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 )