Proper error checking on fwrite() call

Fri, 27 Apr 2007 03:41:50 +0000

author
Sean Egan <seanegan@pidgin.im>
date
Fri, 27 Apr 2007 03:41:50 +0000
changeset 16554
63f70c76f8c5
parent 16553
ccec9581f071
child 16558
d98a53c5650c

Proper error checking on fwrite() call

libpurple/core.c file | annotate | diff | comparison | revisions
--- a/libpurple/core.c	Fri Apr 27 03:27:29 2007 +0000
+++ b/libpurple/core.c	Fri Apr 27 03:41:50 2007 +0000
@@ -310,7 +310,7 @@
 gboolean
 purple_core_migrate(void)
 {
-#error  This code wants to migrate your .gaim directory to .purple. It is strongly suggested that you back .gaim up before proceeding.
+#error You probably want to back up your .gaim directory right now. This revision is going to destroy it, potentially not in the way we've intended
 	const char *user_dir = purple_user_dir();
 	char *old_user_dir = g_strconcat(purple_home_dir(),
 	                                 G_DIR_SEPARATOR_S ".gaim", NULL);
@@ -597,7 +597,7 @@
 					return FALSE;
 				}
 
-				if (!fwrite(buf, size, 1, new_file))
+				if (!fwrite(buf, size, 1, new_file) && ferror(new_file) != 0)
 				{
 					purple_debug_error("core", "Error writing %s: %s\n",
 					                   new_name, strerror(errno));

mercurial