Changeset 8e9e2b7 for help.c

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• help.c (modified) (4 diffs)

help.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2009 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+#include "help.h"
 #undef read 
 #undef write
@@ -157 +158 @@
                         }
                         
-                        lseek( h->fd, h->offset.file_offset, SEEK_SET );
-                        read( h->fd, s, h->length );
+                        if( lseek( h->fd, h->offset.file_offset, SEEK_SET ) == -1 ||
+                            read( h->fd, s, h->length ) != h->length )
+                                return NULL;
                 }
                 else
@@ -193 +195 @@
         return 1;
 }
+
+char *help_get_whatsnew( help_t **help, int old )
+{
+        GString *ret = NULL;
+        help_t *h;
+        int v;
+        
+        for( h = *help; h; h = h->next )
+                if( h->title != NULL && strncmp( h->title, "whatsnew", 8 ) == 0 &&
+                    sscanf( h->title + 8, "%x", &v ) == 1 && v > old )
+                {
+                        char *s = help_get( &h, h->title );
+                        if( ret == NULL )
+                                ret = g_string_new( s );
+                        else
+                                g_string_append_printf( ret, "\n\n%s", s );
+                        g_free( s );
+                }
+        
+        return ret ? g_string_free( ret, FALSE ) : NULL;
+}