luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 577534 - Use rename to write new typelibs, instead of in-place overwrite

Browse Source 
This avoids having processes with the typelibs currently open exploding
immediately.
This commit is contained in:
Colin Walters 2009-06-09 14:03:47 -04:00 committed by Evan Welsh
parent f3d30afed7
commit 7f4477c610
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
girepository/tools/compiler.c
View File

@ -23,6 +23,7 @@
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gio/gio.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> #include <io.h>
@ -97,34 +98,38 @@ write_out_typelib (gchar *prefix,
{ {
FILE *file; FILE *file;
gsize written; gsize written;
GFile *file_obj;
gchar *filename;
GFile *tmp_file_obj;
gchar *tmp_filename;
GError *error = NULL;
if (output == NULL) if (output == NULL)
{ {
file = stdout; file = stdout;
filename = NULL;
tmp_filename = NULL;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
setmode (fileno (file), _O_BINARY); setmode (fileno (file), _O_BINARY);
#endif #endif
} }
else else
{ {
gchar *filename;
if (prefix) if (prefix)
filename = g_strdup_printf ("%s-%s", prefix, output); filename = g_strdup_printf ("%s-%s", prefix, output);
else else
filename = g_strdup (output); filename = g_strdup (output);
file = g_fopen (filename, "wb"); file_obj = g_file_new_for_path (filename);
tmp_filename = g_strdup_printf ("%s.tmp", filename);
tmp_file_obj = g_file_new_for_path (tmp_filename);
file = g_fopen (tmp_filename, "wb");
if (file == NULL) if (file == NULL)
{ {
g_fprintf (stderr, "failed to open '%s': %s\n", g_fprintf (stderr, "failed to open '%s': %s\n",
filename, g_strerror (errno)); tmp_filename, g_strerror (errno));
g_free (filename); goto out;
return;
} }
g_free (filename);
} }
if (!code) if (!code)
@ -133,7 +138,7 @@ write_out_typelib (gchar *prefix,
if (written < typelib->len) { if (written < typelib->len) {
g_error ("ERROR: Could not write the whole output: %s", g_error ("ERROR: Could not write the whole output: %s",
strerror(errno)); strerror(errno));
return; goto out;
} }
} }
else else
@ -147,6 +152,17 @@ write_out_typelib (gchar *prefix,
if (output != NULL) if (output != NULL)
fclose (file); fclose (file);
if (tmp_filename != NULL)
{
if (!g_file_move (tmp_file_obj, file_obj, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error))
{
g_error ("ERROR: failed to rename %s to %s: %s", tmp_filename, filename, error->message);
g_clear_error (&error);
}
}
out:
g_free (filename);
g_free (tmp_filename);
} }
GLogLevelFlags logged_levels; GLogLevelFlags logged_levels;