AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use g_file_set_contents(). (#308722, Morten Welinder)

Browse Source 
2005-06-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilesystemunix.c (bookmark_list_write): Use
	g_file_set_contents().  (#308722, Morten Welinder)
This commit is contained in:
Matthias Clasen 2005-06-23 04:14:17 +00:00 committed by Matthias Clasen
parent e9bab05794
commit af1c6bb05e
4 changed files with 42 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-06-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesystemunix.c (bookmark_list_write): Use
g_file_set_contents(). (#308722, Morten Welinder)
2005-06-22 Matthias Clasen <mclasen@redhat.com> 2005-06-22 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the * gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-06-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesystemunix.c (bookmark_list_write): Use
g_file_set_contents(). (#308722, Morten Welinder)
2005-06-22 Matthias Clasen <mclasen@redhat.com> 2005-06-22 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the * gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2005-06-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesystemunix.c (bookmark_list_write): Use
g_file_set_contents(). (#308722, Morten Welinder)
2005-06-22 Matthias Clasen <mclasen@redhat.com> 2005-06-22 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the * gdk/x11/gdkdnd-x11.c (xdnd_finished_filter): Set the

94
gtk/gtkfilesystemunix.c
View File

@ -42,7 +42,6 @@
#include <time.h> #include <time.h>
#define BOOKMARKS_FILENAME ".gtk-bookmarks" #define BOOKMARKS_FILENAME ".gtk-bookmarks"
#define BOOKMARKS_TMP_FILENAME ".gtk-bookmarks-XXXXXX"
#define HIDDEN_FILENAME ".hidden" #define HIDDEN_FILENAME ".hidden"
@ -1377,13 +1376,12 @@ is_local_uri (const char *uri)
} }
static char * static char *
bookmark_get_filename (gboolean tmp_file) bookmark_get_filename (void)
{ {
char *filename; char *filename;
filename = g_build_filename (g_get_home_dir (), filename = g_build_filename (g_get_home_dir (),
tmp_file ? BOOKMARKS_TMP_FILENAME : BOOKMARKS_FILENAME, BOOKMARKS_FILENAME, NULL);
NULL);
g_assert (filename != NULL); g_assert (filename != NULL);
return filename; return filename;
} }
@ -1395,7 +1393,7 @@ bookmark_list_read (GSList **bookmarks, GError **error)
gchar *contents; gchar *contents;
gboolean result = FALSE; gboolean result = FALSE;
filename = bookmark_get_filename (FALSE); filename = bookmark_get_filename ();
*bookmarks = NULL; *bookmarks = NULL;
if (g_file_get_contents (filename, &contents, NULL, error)) if (g_file_get_contents (filename, &contents, NULL, error))
@ -1429,78 +1427,40 @@ bookmark_list_read (GSList **bookmarks, GError **error)
} }
static gboolean static gboolean
bookmark_list_write (GSList *bookmarks, GError **error) bookmark_list_write (GSList *bookmarks,
GError **error)
{ {
char *tmp_filename; GSList *l;
GString *string;
char *filename; char *filename;
gboolean result = TRUE; GError *tmp_error = NULL;
FILE *file; gboolean result;
int fd;
int saved_errno;
/* First, write a temporary file */ string = g_string_new ("");
tmp_filename = bookmark_get_filename (TRUE); for (l = bookmarks; l; l = l->next)
filename = bookmark_get_filename (FALSE);
fd = g_mkstemp (tmp_filename);
if (fd == -1)
{ {
saved_errno = errno; g_string_append (string, l->data);
goto io_error; g_string_append_c (string, '\n');
} }
if ((file = fdopen (fd, "w")) != NULL) filename = bookmark_get_filename ();
{
GSList *l;
for (l = bookmarks; l; l = l->next) result = g_file_set_contents (filename, string->str, -1, &tmp_error);
if (fputs (l->data, file) == EOF
|| fputs ("\n", file) == EOF)
{
saved_errno = errno;
goto io_error;
}
if (fclose (file) == EOF)
{
saved_errno = errno;
goto io_error;
}
if (rename (tmp_filename, filename) == -1)
{
saved_errno = errno;
goto io_error;
}
result = TRUE;
goto out;
}
else
{
saved_errno = errno;
/* fdopen() failed, so we can't do much error checking here anyway */
close (fd);
}
io_error:
g_set_error (error,
GTK_FILE_SYSTEM_ERROR,
GTK_FILE_SYSTEM_ERROR_FAILED,
_("Bookmark saving failed: %s"),
g_strerror (saved_errno));
result = FALSE;
if (fd != -1)
unlink (tmp_filename); /* again, not much error checking we can do here */
out:
g_free (filename); g_free (filename);
g_free (tmp_filename); g_string_free (string, TRUE);
if (!result)
{
g_set_error (error,
GTK_FILE_SYSTEM_ERROR,
GTK_FILE_SYSTEM_ERROR_FAILED,
_("Bookmark saving failed: %s"),
tmp_error->message);
g_error_free (tmp_error);
}
return result; return result;
} }