summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Scorgie <dscorgie@src.gnome.org>2006-02-27 19:00:05 +0000
committerDon Scorgie <dscorgie@src.gnome.org>2006-02-27 19:00:05 +0000
commitcf8f42504efb477ffe59a2709a45124f20e2d547 (patch)
treee9570a0aba974283da296a44259ccab28b72089a
parent331a785ef6ed92a3b0b77ac3e956eecf7e68afb0 (diff)
downloadyelp-cf8f42504efb477ffe59a2709a45124f20e2d547.tar.gz
Look for spaces when processing man page search results This stops (at
* src/yelp-search-pager.c: Look for spaces when processing man page search results This stops (at least) FreeBSD off-by-1 errors (bug #331828)
-rw-r--r--ChangeLog6
-rw-r--r--src/yelp-search-pager.c8
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a81ce0e..efd3a4d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-27 Don Scorgie <dscorgie@cvs.gnome.org>
+
+ * src/yelp-search-pager.c:
+ Look for spaces when processing man page search results
+ This stops (at least) FreeBSD off-by-1 errors (bug #331828)
+
==================== 2.13.6 ====================
2006-02-26 Brent Smith <gnome@nextreality.net>
diff --git a/src/yelp-search-pager.c b/src/yelp-search-pager.c
index 888d6193..a77b2b3d 100644
--- a/src/yelp-search-pager.c
+++ b/src/yelp-search-pager.c
@@ -1362,7 +1362,7 @@ process_man_result (YelpSearchPager *pager, gchar *result, gchar **terms)
gint i;
for (i=0;split[i];i++) {
- gchar ** line = g_strsplit (split[i], "-", 3);
+ gchar ** line = g_strsplit (split[i], "-", 3);
gchar *filename = NULL;
gchar *desc = NULL;
xmlNode *child;
@@ -1379,8 +1379,10 @@ process_man_result (YelpSearchPager *pager, gchar *result, gchar **terms)
/* First is the filename */
before = g_strdup (g_strchomp (line[0]));
after = strstr (before, "(");
- tmp = after;
- tmp--;
+ tmp = after;
+
+ while (!g_ascii_isspace(*tmp))
+ tmp--;
title = g_strndup (before, tmp-before);