X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/edcaa954bab2d48b54ab3dbcbe3788dc104044dc..b1722537108cceec472480a551b9a7fb9c660c55:/sbr/folder_addmsg.c?ds=sidebyside

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index a0595e6e..f6a9af33 100644
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <errno.h>
 
 /*
  * Link message into a folder.  Return the new number
@@ -135,7 +134,7 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 		(void)ext_hook("ref-hook", oldmsg, newmsg);
 	    }
 	    else
-		(void)ext_hook("add-hook", newmsg, (char *)0);
+		(void)ext_hook("add-hook", newmsg, NULL);
 
 	    return msgnum;
 	} else {
@@ -166,8 +165,9 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 	     * across devices, then check if there is a message
 	     * already in the desired location.  If so, then return
 	     * error, else just copy the message.
+	     * Cygwin with FAT32 filesystem produces EPERM.
 	     */
-	    if (linkerr == EXDEV) {
+	    if (linkerr == EXDEV  ||  linkerr == EPERM) {
 		if (stat (newmsg, &st1) == 0) {
 		    advise (NULL, "message %s:%s already exists", mp->foldpath, newmsg);
 		    return -1;
@@ -191,7 +191,7 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 			(void)ext_hook("ref-hook", oldmsg, newmsg);
 		    }
 		    else
-		        (void)ext_hook("add-hook", newmsg, (char *)0);
+		        (void)ext_hook("add-hook", newmsg, NULL);
 
 		    return msgnum;
 		}