modify g_file_get_contents
tmaid/trunk/ChangeLog (diff)
tmaid/trunk/gcommon/glibfile.c (diff)
tmaid/trunk/gcommon/glibfile.h (diff) tmaid/trunk/gcommon/Makefile.am (diff) tmaid/trunk/configure.ac (diff) tmaid/trunk/po/ja.po (diff)| @@ -1,3 +1,11 @@ | ||
| 1 | +2013-12-31 Kazuki Iwamoto <iwm@maid.org> | |
| 2 | + | |
| 3 | + * version 2.7.8 | |
| 4 | + | |
| 5 | +2013-12-31 Kazuki Iwamoto <iwm@maid.org> | |
| 6 | + | |
| 7 | + * gcommon/glibfile.c: modify g_file_get_contents | |
| 8 | + | |
| 1 | 9 | 2013-09-29 Kazuki Iwamoto <iwm@maid.org> |
| 2 | 10 | |
| 3 | 11 | * version 2.7.7 |
| @@ -46,7 +46,7 @@ | ||
| 46 | 46 | if (fseek (fp, 0, SEEK_END) == 0) |
| 47 | 47 | { |
| 48 | 48 | fs = ftell (fp); |
| 49 | - if (fs >= 0) | |
| 49 | + if (fs >= 0 && fseek (fp, 0, SEEK_SET) == 0) | |
| 50 | 50 | { |
| 51 | 51 | buf = g_malloc (fs + 1); |
| 52 | 52 | buf[fs] = '\0'; |
| @@ -102,11 +102,8 @@ | ||
| 102 | 102 | #endif /* not GLIB_CHECK_VERSION(2,8,0) */ |
| 103 | 103 | #if ! GLIB_CHECK_VERSION(2,18,0) |
| 104 | 104 | # ifdef G_OS_WIN32 |
| 105 | -# include <sys/utime.h> | |
| 105 | +# include <sys/utime.h> | |
| 106 | 106 | # endif /* G_OS_WIN32 */ |
| 107 | -# ifdef HAVE_UTIME_H | |
| 108 | -# include <utime.h> | |
| 109 | -# endif /* HAVE_UTIME_H */ | |
| 110 | 107 | gint g_utime (const gchar *filename, struct utimbuf *utb); |
| 111 | 108 | #endif /* not GLIB_CHECK_VERSION(2,18,0) */ |
| 112 | 109 |
| @@ -25,10 +25,6 @@ | ||
| 25 | 25 | gtk2widget.c gtk2widget.h \ |
| 26 | 26 | gdk2keysyms.h |
| 27 | 27 | |
| 28 | -AM_CPPFLAGS = \ | |
| 29 | - -DLOCALEDIR=\""$(localedir)"\" \ | |
| 30 | - -DSYSCONFDIR=\""$(sysconfdir)"\" | |
| 31 | - | |
| 32 | 28 | INCLUDES = \ |
| 33 | 29 | $(GTK_CFLAGS) |
| 34 | 30 |
| @@ -5,7 +5,7 @@ | ||
| 5 | 5 | dnl version number |
| 6 | 6 | MAJOR_VERSION=2 |
| 7 | 7 | MINOR_VERSION=7 |
| 8 | -MICRO_VERSION=7 | |
| 8 | +MICRO_VERSION=8 | |
| 9 | 9 | EXTRA_VERSION= |
| 10 | 10 | VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION |
| 11 | 11 |
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 | # |
| 5 | 5 | msgid "" |
| 6 | 6 | msgstr "" |
| 7 | -"Project-Id-Version: tmaid 2.7.6\n" | |
| 7 | +"Project-Id-Version: tmaid 2.7.8\n" | |
| 8 | 8 | "Report-Msgid-Bugs-To: http://www.maid.org/\n" |
| 9 | 9 | "POT-Creation-Date: 2013-09-29 23:49+0900\n" |
| 10 | 10 | "PO-Revision-Date: 2002-08-11 18:10+0900\n" |
Text maid
iwm