Merge remote-tracking branch 'origin/master'

[mmh] / sbr / folder_addmsg.c

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 423384a..4cc8d6c 100644 (file)
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -6,9 +6,11 @@
 ** complete copyright information.
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 /*
 ** Link message into a folder.  Return the new number
@@ -132,20 +134,16 @@ folder_addmsg(struct msgs **mpp, char *msgfile, int selected,
                if (link(msgfile, newmsg) != -1) {
 
                        if (deleting) {
-                               (void)snprintf(oldmsg, sizeof (oldmsg), "%s/%s", from_dir, msgfile);
-                               (void)ext_hook("ref-hook", oldmsg, newmsg);
+                               snprintf(oldmsg, sizeof (oldmsg), "%s/%s",
+                                               from_dir, msgfile);
+                               ext_hook("ref-hook", oldmsg, newmsg);
                        } else
-                               (void)ext_hook("add-hook", newmsg, (char *)0);
+                               ext_hook("add-hook", newmsg, NULL);
 
                        return msgnum;
                } else {
                        linkerr = errno;
 
-#ifdef EISREMOTE
-                       if (linkerr == EISREMOTE)
-                               linkerr = EXDEV;
-#endif /* EISREMOTE */
-
                        /*
                        ** Check if the file in our desired location is
                        ** the same as the source file.  If so, then just
@@ -188,10 +186,13 @@ folder_addmsg(struct msgs **mpp, char *msgfile, int selected,
                                        close(outfd);
 
                                        if (deleting) {
-                                               (void)snprintf(oldmsg, sizeof (oldmsg), "%s/%s", from_dir, msgfile);
-                                               (void)ext_hook("ref-hook", oldmsg, newmsg);
+                                               snprintf(oldmsg, sizeof oldmsg,
+                                                               "%s/%s",
+                                                               from_dir,
+                                                               msgfile);
+                                               ext_hook("ref-hook", oldmsg, newmsg);
                                        } else
-                                               (void)ext_hook("add-hook", newmsg, (char *)0);
+                                               ext_hook("add-hook", newmsg, NULL);
 
                                        return msgnum;
                                }