From c341e8d1af7fc9c5fa3e553aac8278f6bfe675d6 Mon Sep 17 00:00:00 2001 From: Melvin Hadasht Date: Thu, 13 Jun 2002 12:06:35 +0000 Subject: [PATCH] po/POTFILES.in Added src/string_match.c src/string_match.c Fixed possible buffer overflow. Corrected typo. Added missing config.h header. src/prefs_common.c src/prefs_matcher.c src/prefs_scoring.c Made some strings translatable (missing _(..)). --- ChangeLog.claws | 13 +++++++++++++ configure.in | 2 +- po/POTFILES.in | 1 + src/prefs_common.c | 2 +- src/prefs_matcher.c | 2 +- src/prefs_scoring.c | 2 +- src/string_match.c | 11 +++++++++-- 7 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 7f943a00b..9982049de 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,16 @@ +2002-06-13 [melvin] 0.7.6claws44 + + * po/POTFILES.in + Added src/string_match.c + * src/string_match.c + Fixed possible buffer overflow. + Corrected typo. + Added missing config.h header. + * src/prefs_common.c + src/prefs_matcher.c + src/prefs_scoring.c + Made some strings translatable (missing _(..)). + 2002-06-13 [melvin] 0.7.6claws43 * README.claws diff --git a/configure.in b/configure.in index 3887ffd16..cbdc43b10 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ MINOR_VERSION=7 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws43 +EXTRA_VERSION=claws44 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/po/POTFILES.in b/po/POTFILES.in index 088af780b..3bfbd7939 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -97,6 +97,7 @@ src/socket.c src/sourcewindow.c src/ssl.c src/statusbar.c +src/string_match.c src/summary_search.c src/summaryview.c src/syldap.c diff --git a/src/prefs_common.c b/src/prefs_common.c index a732089bb..bd1b6af5b 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -2768,7 +2768,7 @@ static void prefs_interface_create(void) gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked", GTK_SIGNAL_FUNC (prefs_keybind_select), NULL); - PACK_FRAME(vbox1, frame_pixmap_theme, "Pixmap theme"); + PACK_FRAME(vbox1, frame_pixmap_theme, _("Pixmap theme")); vbox_pixmap_theme = gtk_vbox_new(FALSE, 0); gtk_widget_show(vbox_pixmap_theme); diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c index d2a1b5a10..20de31215 100644 --- a/src/prefs_matcher.c +++ b/src/prefs_matcher.c @@ -551,7 +551,7 @@ static void prefs_matcher_create(void) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - title[0] = ("Registered rules"); + title[0] = _("Registered rules"); cond_clist = gtk_clist_new_with_titles(1, title); gtk_widget_show (cond_clist); gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist); diff --git a/src/prefs_scoring.c b/src/prefs_scoring.c index 3c25470a2..ff9005ef0 100644 --- a/src/prefs_scoring.c +++ b/src/prefs_scoring.c @@ -300,7 +300,7 @@ static void prefs_scoring_create(void) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - title[0] = ("Registered rules"); + title[0] = _("Registered rules"); cond_clist = gtk_clist_new_with_titles(1, title); gtk_widget_show (cond_clist); gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist); diff --git a/src/string_match.c b/src/string_match.c index 0517e4fbb..52e5066d1 100644 --- a/src/string_match.c +++ b/src/string_match.c @@ -18,6 +18,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "intl.h" #include "string_match.h" @@ -63,8 +67,11 @@ gchar *string_remove_match(gchar *buf, gint buflen, gchar * txt, regex_t *preg) } } while (txt[j] && i < buflen - 1); buf[i] = 0x00; - if (buf[0] == 0x00) - strcpy(buf, _("(Subject cleared by regexp)")); + if (buf[0] == 0x00) { + strncpy(buf, _("(Subject cleared by RegExp)"), + buflen - 1); + buf[buflen - 1] = 0x00; + } return buf; } return txt; -- 2.25.1