[Commits] [SCM] claws branch, master, updated. 3.18.0-93-gd5053bf90
miras at claws-mail.org
miras at claws-mail.org
Thu Sep 9 21:59:48 UTC 2021
The branch, master has been updated
via d5053bf90360444100336cecf8ebb5848e601c78 (commit)
via 2d41301d0d41985e45ffe534de2edefcf4da1eb7 (commit)
via 82b23ceeec4039b5b5be8e09b12fb34b6ee4f66b (commit)
via 43d2cef4718de4f0e5a501a57111ae58529cb074 (commit)
via 786008d8e4f3eb475d731a6e6bbf4e0e583b680b (commit)
via 98731f9d70344116ce382d9b866cacf31cf02aaf (commit)
via 3530d881e3d9b28725ca4657d57da972237f0f18 (commit)
via f18a7806b0a5996a5ad8f9db7194cee372e3cc52 (commit)
via 9ffe6db441e441feea5d4ff5ad055d9b2e407c25 (commit)
from 8589ae35c394de678bc4c24e6571633c337e0ba6 (commit)
Summary of changes:
autogen.sh | 0
config/test-driver | 0
src/common/file-utils.c | 9 ++++++---
src/etpan/imap-thread.c | 3 ++-
src/main.c | 3 ++-
src/plugins/archive/libarchive_archive.c | 6 ++++--
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 ++-
tools/check-appstream.sh | 0
tools/claws.get.tlds.pl | 0
tools/gitlog2changelog.py | 0
14 files changed, 26 insertions(+), 13 deletions(-)
mode change 100755 => 100644 autogen.sh
mode change 100755 => 100644 config/test-driver
mode change 100755 => 100644 tools/check-appstream.sh
mode change 100755 => 100644 tools/claws.get.tlds.pl
mode change 100755 => 100644 tools/gitlog2changelog.py
- Log -----------------------------------------------------------------
commit d5053bf90360444100336cecf8ebb5848e601c78
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:59:37 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 6e419b69a..f8721069b 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);
commit 2d41301d0d41985e45ffe534de2edefcf4da1eb7
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:58:44 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 e9bb5dc94..b2b1b77e7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2633,7 +2633,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 82b23ceeec4039b5b5be8e09b12fb34b6ee4f66b
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:57:44 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 43d2cef4718de4f0e5a501a57111ae58529cb074
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:56:30 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 62d9a12ee..30c8c8fc9 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");
@@ -309,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");
@@ -319,7 +321,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 786008d8e4f3eb475d731a6e6bbf4e0e583b680b
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:53:00 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 c77ac67f1..b49548022 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 98731f9d70344116ce382d9b866cacf31cf02aaf
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:51:32 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 11772d8b7..07488dc11 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -723,7 +723,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 3530d881e3d9b28725ca4657d57da972237f0f18
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:50:21 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 60a408dfb..8434882a3 100644
--- a/src/plugins/tnef_parse/tnef_parse.c
+++ b/src/plugins/tnef_parse/tnef_parse.c
@@ -126,14 +126,16 @@ 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."));
}
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 f18a7806b0a5996a5ad8f9db7194cee372e3cc52
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:48:14 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 9ffe6db441e441feea5d4ff5ad055d9b2e407c25
Author: Michael Rasmussen <mir at datanom.net>
Date: Thu Sep 9 23:45:53 2021 +0200
Fix CID 1491392
Signed-off-by: Michael Rasmussen <mir at datanom.net>
diff --git a/autogen.sh b/autogen.sh
old mode 100755
new mode 100644
diff --git a/config/test-driver b/config/test-driver
old mode 100755
new mode 100644
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index a8819d8f6..c28c9bcd1 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -250,14 +250,16 @@ void archive_free_file_list(gboolean md5, gboolean rename) {
if (!rename && md5 && g_str_has_suffix(file->name, ".md5")) {
path = g_strdup_printf("%s/%s", file->path, file->name);
debug_print("unlinking %s\n", path);
- g_unlink(path);
+ if (g_unlink(path) < 0)
+ FILE_OP_ERROR(path, "g_unlink");
g_free(path);
}
if (rename) {
path = g_strdup_printf("%s/%s", file->path, file->name);
debug_print("unlinking %s\n", path);
g_unlink(path);
- g_free(path);
+ if (g_unlink(path) < 0)
+ FILE_OP_ERROR(path, "g_unlink");
}
archive_free_file_info(file);
file_list->data = NULL;
diff --git a/tools/check-appstream.sh b/tools/check-appstream.sh
old mode 100755
new mode 100644
diff --git a/tools/claws.get.tlds.pl b/tools/claws.get.tlds.pl
old mode 100755
new mode 100644
diff --git a/tools/gitlog2changelog.py b/tools/gitlog2changelog.py
old mode 100755
new mode 100644
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list