X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fdropsbr.c;h=212d162ab0e2a2d473ec33b08717de01f09486b8;hb=e121e49643a86c4e7fb34dd75ed1542759aa16c9;hp=cc35f5f19938a37a1d8dd594b19d43e50f9e83c7;hpb=e7f0dbf0856b7eb1f97f4c95fe39497b1ca97998;p=mmh

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index cc35f5f..212d162 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -3,6 +3,10 @@
  * 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>
@@ -10,8 +14,8 @@
 #ifndef	MMDFONLY
 # include <h/mh.h>
 # include <h/dropsbr.h>
-# include <zotnet/mts/mts.h>
-# include <zotnet/tws/tws.h>
+# include <h/mts.h>
+# include <h/tws.h>
 #else
 # include "dropsbr.h"
 # include "strings.h"
@@ -38,7 +42,7 @@ extern int errno;
  */
 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);
 
 
 /*
@@ -565,14 +569,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++;
     }
@@ -594,6 +604,7 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
 		return NOTOK;
 
 	    case OK:
+		fclose (fp);
 		break;
 
 	    default:
@@ -611,6 +622,7 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
 		    }
 		}
 		free ((char *) rp);
+		fclose (fp);
 		break;
 	}
     }
@@ -651,7 +663,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;