X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdropsbr.c;h=84435a2eb290cb1ed383ee5f13eecb4320f89583;hp=857263a1a8b9810b976fb01866cf09ec2dcaa7ce;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 857263a..84435a2 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -3,20 +3,19 @@
  * dropsbr.c -- create/read/manipulate mail drops
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/nmh.h>
+#include <h/utils.h>
 
-#ifndef	MMDFONLY
-# include <h/mh.h>
-# include <h/dropsbr.h>
-# include <zotnet/mts/mts.h>
-# include <zotnet/tws/tws.h>
-#else
-# include "dropsbr.h"
-# include "strings.h"
-# include "mmdfonly.h"
-#endif
+#include <h/mh.h>
+#include <h/dropsbr.h>
+#include <h/mts.h>
+#include <h/tws.h>
 
 #ifdef HAVE_ERRNO_H
 # include <errno.h>
@@ -31,14 +30,12 @@
 
 #include <fcntl.h>
 
-extern int errno;
-
 /*
  * static prototypes
  */
 static int mbx_chk_mbox (int);
 static int mbx_chk_mmdf (int);
-static int map_open (char *, int *, int);
+static int map_open (char *, int);
 
 
 /*
@@ -222,14 +219,8 @@ mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
 	if (dp >= ep) {
 	    register int    curlen = dp - pp;
 
-	    cp = (struct drop *) realloc ((char *) pp,
+	    cp = (struct drop *) mh_xrealloc ((char *) pp,
 		                    (size_t) (len += MAXFOLDER) * sizeof(*pp));
-	    if (cp == NULL) {
-		if (noisy)
-		    admonish (NULL, "unable to allocate drop storage");
-		free ((char *) pp);
-		return 0;
-	    }
 	    dp = cp + curlen, ep = (pp = cp) + len - 1;
 	}
     }
@@ -385,7 +376,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 			    fp = strchr(ep + 1, '\n');
 			tp = dctime(dlocaltimenow());
 			snprintf (buffer, sizeof(buffer), "From %.*s  %s",
-				fp - ep, ep, tp);
+				(int)(fp - ep), ep, tp);
 		    } else if (!strncmp (buffer, "X-Envelope-From:", 16)) {
 			/*
 			 * Change the "X-Envelope-From:" field
@@ -408,8 +399,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 			strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
 			ep = "nobody@nowhere";
 			tp = dctime(dlocaltimenow());
-			snprintf (buffer, sizeof(buffer), "From %s  %s", ep, tp);
-			strcat (buffer, tmpbuffer);
+			snprintf (buffer, sizeof(buffer), "From %s  %s%s", ep, tp, tmpbuffer);
 		    }
 		}
 
@@ -498,10 +488,10 @@ map_name (char *file)
     if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
 	dp = cp + strlen (cp);
     if (cp == file)
-	snprintf (buffer, sizeof(buffer), ".%.*s%s", dp - cp, cp, ".map");
+	snprintf (buffer, sizeof(buffer), ".%.*s%s", (int)(dp - cp), cp, ".map");
     else
 	snprintf (buffer, sizeof(buffer), "%.*s.%.*s%s",
-		cp - file, file, dp - cp, cp, ".map");
+		(int)(cp - file), file, (int)(dp - cp), cp, ".map");
 
     return buffer;
 }
@@ -566,14 +556,20 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
     register struct drop *dp;
     struct drop d1, d2, *rp;
     register FILE *fp;
+    struct stat st;
 
-    if ((fd = map_open (file = map_name (mailbox), &clear, md)) == NOTOK)
+    if ((fd = map_open (file = map_name (mailbox), md)) == NOTOK)
 	return NOTOK;
 
+    if ((fstat (fd, &st) == OK) && (st.st_size > 0))
+	clear = 0;
+    else
+	clear = 1;
+
     if (!clear && map_chk (file, fd, &d1, pos, noisy)) {
 	unlink (file);
 	mbx_close (file, fd);
-	if ((fd = map_open (file, &clear, md)) == NOTOK)
+	if ((fd = map_open (file, md)) == NOTOK)
 	    return NOTOK;
 	clear++;
     }
@@ -595,6 +591,7 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
 		return NOTOK;
 
 	    case OK:
+		fclose (fp);
 		break;
 
 	    default:
@@ -612,6 +609,7 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
 		    }
 		}
 		free ((char *) rp);
+		fclose (fp);
 		break;
 	}
     }
@@ -652,7 +650,7 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
 
 
 static int
-map_open (char *file, int *clear, int md)
+map_open (char *file, int md)
 {
     mode_t mode;
     struct stat st;