X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_addmsg.c;h=4cc8d6c65a49b739288cb4806f09ac2efc9dee68;hp=423384a0616898dc1b08992519aded88c8d823d1;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 423384a..4cc8d6c 100644
--- 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;
 				}