[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-144-g1850c52bb

miras at claws-mail.org miras at claws-mail.org
Thu Sep 9 21:42:35 UTC 2021


The branch, gtk3 has been updated
       via  1850c52bb1dbf16e55a80258b63c6c6f825d49ce (commit)
       via  e4be4beeb8f806daed7369e88612ed0f62abc7bd (commit)
       via  23d991d97b3d2fb4eaaf6f19825561b83191719f (commit)
       via  dc931c8e6e12f23756b04bbfb10e6951864924ec (commit)
       via  4f9c021852d069ba9281e60920887cb06083c8ae (commit)
       via  ead53a765056e1732329020ef61c0470e09a6d0a (commit)
       via  b4b33b25f8d18e9e4a047a67f94ba5ef56335a22 (commit)
       via  f2a5d59d363c5859750d8b7736cdc72a7b1a721f (commit)
       via  f405cef3d3d7c160e428e0367917882d2458fc0e (commit)
       via  bd1db001e30f0e43fbac014f900eb4d0aa47631d (commit)
       via  b38c4362ba68c88e96de14edda735357cc0adfa5 (commit)
      from  531f47d9bac2e07eff0b6827fd69657b3eff0721 (commit)

Summary of changes:
 src/common/file-utils.c                                          | 9 ++++++---
 src/etpan/imap-thread.c                                          | 3 ++-
 src/main.c                                                       | 3 ++-
 src/plugins/clamd/clamav_plugin.c                                | 3 ++-
 .../notification/gtkhotkey/gtk-hotkey-key-file-registry.c        | 3 ++-
 src/plugins/tnef_parse/tnef_parse.c                              | 6 ++++--
 src/plugins/vcalendar/vcal_folder.c                              | 3 ++-
 src/procmime.c                                                   | 3 ++-
 8 files changed, 22 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 1850c52bb1dbf16e55a80258b63c6c6f825d49ce
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:42:06 2021 +0200

    Fix CID 1491374
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
index 239b9a2e1..3afedab6b 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
@@ -413,7 +413,8 @@ gtk_hotkey_key_file_registry_real_delete_hotkey (GtkHotkeyRegistry	*base,
 	}
 	
 	tmp_error = NULL;
-	g_file_set_contents (path, contents, size, &tmp_error);
+	if (g_file_set_contents (path, contents, size, &tmp_error) != TRUE)
+                FILE_OP_ERROR(path, "g_file_set_contents");
 	if (tmp_error) {
 		g_set_error (error, GTK_HOTKEY_REGISTRY_ERROR,
 					 GTK_HOTKEY_REGISTRY_ERROR_IO,

commit e4be4beeb8f806daed7369e88612ed0f62abc7bd
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:38:45 2021 +0200

    Fix CID 1491375
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/tnef_parse/tnef_parse.c b/src/plugins/tnef_parse/tnef_parse.c
index 2ea01a2d0..b2ccdef41 100644
--- a/src/plugins/tnef_parse/tnef_parse.c
+++ b/src/plugins/tnef_parse/tnef_parse.c
@@ -126,7 +126,8 @@ static MimeInfo *tnef_dump_file(const gchar *filename, char *data, size_t size)
 	if (claws_fwrite(data, 1, size, fp) < size) {
 		FILE_OP_ERROR(tmpfilename, "claws_fwrite");
 		claws_fclose(fp);
-		claws_unlink(tmpfilename);
+                if (claws_unlink(tmpfilename) < 0)
+                        FILE_OP_ERROR(tmpfilename, "claws_unlink");
 		procmime_mimeinfo_free_all(&sub_info);
 		return tnef_broken_mimeinfo(_("Failed to write the part data."));
 	}

commit 23d991d97b3d2fb4eaaf6f19825561b83191719f
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:37:34 2021 +0200

    Fix CID 1491375
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/tnef_parse/tnef_parse.c b/src/plugins/tnef_parse/tnef_parse.c
index 9f2b18e59..2ea01a2d0 100644
--- a/src/plugins/tnef_parse/tnef_parse.c
+++ b/src/plugins/tnef_parse/tnef_parse.c
@@ -133,7 +133,8 @@ static MimeInfo *tnef_dump_file(const gchar *filename, char *data, size_t size)
 	claws_fclose(fp);
 
 	if (g_stat(tmpfilename, &statbuf) < 0) {
-		claws_unlink(tmpfilename);
+		if (claws_unlink(tmpfilename) < 0)
+                        FILE_OP_ERROR(tmpfilename, "claws_unlink");
 		procmime_mimeinfo_free_all(&sub_info);
 		return tnef_broken_mimeinfo(_("Failed to write the part data."));
 	} else {

commit dc931c8e6e12f23756b04bbfb10e6951864924ec
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:36:22 2021 +0200

    Fix CID 1491376
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/procmime.c b/src/procmime.c
index 572a4c877..a51782f6d 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -725,7 +725,8 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
 	if (claws_fclose(outfp) == EOF) {
 		saved_errno = errno;
 		FILE_OP_ERROR(outfile, "claws_fclose");
-		claws_unlink(outfile);
+		if (claws_unlink(outfile) < 0)
+                        FILE_OP_ERROR(outfile, "claws_unlink");
 		return -(saved_errno);
 	}
 

commit 4f9c021852d069ba9281e60920887cb06083c8ae
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:34:52 2021 +0200

    Fix CID 1491377
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/clamd/clamav_plugin.c b/src/plugins/clamd/clamav_plugin.c
index dac5ff9e7..8035fd678 100644
--- a/src/plugins/clamd/clamav_plugin.c
+++ b/src/plugins/clamd/clamav_plugin.c
@@ -149,7 +149,8 @@ static gboolean scan_func(GNode *node, gpointer data)
 				g_free(msg);
 			}
 		}
-		g_unlink(outfile);
+		if (g_unlink(outfile) < 0)
+                        FILE_OP_ERROR(outfile, "g_unlink");
 	}
 	
 	return (result->status == OK) ? FALSE : TRUE;

commit ead53a765056e1732329020ef61c0470e09a6d0a
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:33:22 2021 +0200

    Fix CID 1491381
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/common/file-utils.c b/src/common/file-utils.c
index 28c66553e..441d8fbd1 100644
--- a/src/common/file-utils.c
+++ b/src/common/file-utils.c
@@ -310,7 +310,8 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
 	}
 
 	if (err) {
-		claws_unlink(dest);
+		if (claws_unlink(dest) < 0)
+                        FILE_OP_ERROR(dest, "claws_unlink");
 		if (dest_bak) {
 			if (rename_force(dest_bak, dest) < 0)
 				FILE_OP_ERROR(dest_bak, "rename");

commit b4b33b25f8d18e9e4a047a67f94ba5ef56335a22
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:32:02 2021 +0200

    Fix CID 1491381
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/common/file-utils.c b/src/common/file-utils.c
index 3f8e7106f..28c66553e 100644
--- a/src/common/file-utils.c
+++ b/src/common/file-utils.c
@@ -288,7 +288,8 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
 			g_warning("writing to %s failed", dest);
 			claws_fclose(dest_fp);
 			claws_fclose(src_fp);
-			claws_unlink(dest);
+			if (claws_unlink(dest) < 0)
+                                FILE_OP_ERROR(dest, "claws_unlink");
 			if (dest_bak) {
 				if (rename_force(dest_bak, dest) < 0)
 					FILE_OP_ERROR(dest_bak, "rename");

commit f2a5d59d363c5859750d8b7736cdc72a7b1a721f
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:30:27 2021 +0200

    Fix CID 1491381
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/common/file-utils.c b/src/common/file-utils.c
index 6995ce24c..3f8e7106f 100644
--- a/src/common/file-utils.c
+++ b/src/common/file-utils.c
@@ -319,7 +319,8 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
 	}
 
 	if (keep_backup == FALSE && dest_bak)
-		claws_unlink(dest_bak);
+		if (claws_unlink(dest_bak) < 0)
+                        FILE_OP_ERROR(dest_bak, "claws_unlink");
 
 	g_free(dest_bak);
 

commit f405cef3d3d7c160e428e0367917882d2458fc0e
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:29:05 2021 +0200

    Fix CID 1491384
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 6586f26bf..252863ab3 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -2663,7 +2663,8 @@ static void fetch_content_run(struct etpan_thread_op * op)
 	close:
 		close(fd);
 	unlink:
-		claws_unlink(param->filename);
+		if (claws_unlink(param->filename) < 0)
+                        FILE_OP_ERROR(param->filename, "claws_unlink");
 	
 	free:
 		/* mmap_string_unref is a simple free in libetpan

commit bd1db001e30f0e43fbac014f900eb4d0aa47631d
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:24:50 2021 +0200

    Fix CID 1491386
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/main.c b/src/main.c
index 39f8cd5da..902857081 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2627,7 +2627,8 @@ static gint lock_socket_remove(void)
 #ifdef G_OS_UNIX
 	filename = claws_get_socket_name();
 	dirname = g_path_get_dirname(filename);
-	claws_unlink(filename);
+	if (claws_unlink(filename) < 0)
+                FILE_OP_ERROR(filename, "claws_unlink");
 	g_rmdir(dirname);
 	g_free(dirname);
 #endif

commit b38c4362ba68c88e96de14edda735357cc0adfa5
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Sep 9 23:22:20 2021 +0200

    Fix CID 1491387
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index ddf255cb2..82c8feded 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1296,7 +1296,8 @@ void vcal_folder_gtk_done(void)
 		if (!file)			
 			continue;
 		debug_print("removing %s\n", file);
-		g_unlink(file);
+		if (g_unlink(file) < 0)
+                        FILE_OP_ERROR(file, "g_unlink");
 		g_free(file);
 	}
 	g_slist_free(created_files);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list