Remove h/nmh.h

[mmh] / uip / dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index f093c2f..5b5cf0e 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -6,17 +6,13 @@
 ** complete copyright information.
 */
 
-#include <h/nmh.h>
+#include <stdlib.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/dropsbr.h>
 #include <h/tws.h>
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
+#include <errno.h>
 #include <fcntl.h>
 
 
@@ -25,7 +21,7 @@
 ** a file or maildrop.
 */
 int
-mbx_open(char *file, uid_t uid, gid_t gid, mode_t mode)
+mbox_open(char *file, uid_t uid, gid_t gid, mode_t mode)
 {
        int i, count, fd;
        struct stat st;
@@ -102,7 +98,7 @@ mbx_open(char *file, uid_t uid, gid_t gid, mode_t mode)
 ** Append message to end of mbox.
 */
 int
-mbx_copy(int to, int from)
+mbox_copy(int to, int from)
 {
        int i;
        char buffer[BUFSIZ];
@@ -173,7 +169,7 @@ mbx_copy(int to, int from)
                if (i != 0 && strncmp(buffer, "From ", 5) == 0) {
                        write(to, ">", 1);
                }
-               if (write(to, buffer, strlen(buffer)) != strlen(buffer)) {
+               if (write(to, buffer, strlen(buffer)) != (int)strlen(buffer)) {
                        fclose(fp);
                        return NOTOK;
                }
@@ -194,7 +190,7 @@ mbx_copy(int to, int from)
 ** Close and unlock file/maildrop.
 */
 int
-mbx_close(char *mailbox, int md)
+mbox_close(char *mailbox, int md)
 {
        if (lkclose(md, mailbox) == 0)
                return OK;