From fdf383e87c9295cbf6d40c4bae7763fc0e057a14 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 5 Oct 2006 18:09:33 +0000 Subject: [PATCH] 2006-10-05 [colin] 2.5.3cvs9 * src/prefs_gtk.c Use unlocked_stdio here too --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_gtk.c | 5 ++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e80ae1b41..640006f4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-05 [colin] 2.5.3cvs9 + + * src/prefs_gtk.c + Use unlocked_stdio here too + 2006-10-05 [colin] 2.5.3cvs8 * src/folderview.c diff --git a/PATCHSETS b/PATCHSETS index 12daf493d..059ddd2c0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1963,3 +1963,4 @@ ( cvs diff -u -r 1.36.2.82 -r 1.36.2.83 src/common/utils.c; ) > 2.5.3cvs6.patchset ( cvs diff -u -r 1.36.2.83 -r 1.36.2.84 src/common/utils.c; ) > 2.5.3cvs7.patchset ( cvs diff -u -r 1.207.2.128 -r 1.207.2.129 src/folderview.c; cvs diff -u -r 1.16.2.44 -r 1.16.2.45 src/msgcache.c; ) > 2.5.3cvs8.patchset +( cvs diff -u -r 1.10.2.19 -r 1.10.2.20 src/prefs_gtk.c; ) > 2.5.3cvs9.patchset diff --git a/configure.ac b/configure.ac index 66c68cb30..8ec67069a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=3 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=8 +EXTRA_VERSION=9 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c index 718353d9d..10638ada5 100644 --- a/src/prefs_gtk.c +++ b/src/prefs_gtk.c @@ -76,8 +76,10 @@ void prefs_read_config(PrefParam *param, const gchar *label, block_label = g_strdup_printf("[%s]", label); + flockfile(fp); + /* search aiming block */ - while (fgets(buf, sizeof(buf), fp) != NULL) { + while (fgets_unlocked(buf, sizeof(buf), fp) != NULL) { gint val; if (encoding) { @@ -119,6 +121,7 @@ void prefs_read_config(PrefParam *param, const gchar *label, } debug_print("Finished reading configuration.\n"); + funlockfile(fp); fclose(fp); } -- 2.25.1