began work on expunge

stopped an invalid pointer use in mail.C

+1999-11-06  Sean 'Shaleh' Perry  <shaleh@debian.org>
+
+	* libmailbox/unixmbox.*: work on expunge
+	    use read/write along with lseek
+		still blows up -- getting there
+	* mail/mail.c: check return value of mbox_open()
+
 1999-10-23  Alain Magloire
 1999-10-23  Alain Magloire
 
 
 	* ChangeLog: Cleanup according to GNU std, and remove
 	* ChangeLog: Cleanup according to GNU std, and remove

@@ -5,14 +5,13 @@
 
 
 * autogen.sh (libtool) complains about libmailbox.la in noinst (JB Oct 08/99)
 * autogen.sh (libtool) complains about libmailbox.la in noinst (JB Oct 08/99)
 
 
-+ libmailbox has a nasty bug -- if the mailbox is empty, the library has no idea
-  what to do (Shaleh Oct 07/99)
+- added more includes to libmailbox, make sure autoconf finds them
 
 
 - libmailbox needs an interface to set flags for each message
 - libmailbox needs an interface to set flags for each message
 
 
 - libmailbox needs an interface to set and create values in the header
 - libmailbox needs an interface to set and create values in the header
 
 
-+ crypt is linked even if pam was detected, it should be one or the other (JB Oct 08/99)
+- clean up 'mail''s compilation
 
 
 - find out why the pop3 server quits on a signal when the 'quit' command is
 - find out why the pop3 server quits on a signal when the 'quit' command is
   given
   given
@@ -21,10 +20,16 @@
 
 
 - test network code
 - test network code
 
 
-+ add imap server code (JB && Shaleh Oct 11/99)
-
 - add more features
 - add more features
 
 
 - optimize everything
 - optimize everything
 
 
 - test everything
 - test everything
+
++ libmailbox has a nasty bug -- if the mailbox is empty, the library has no idea
+  what to do (Shaleh Oct 07/99)
+  
++ crypt is linked even if pam was detected, it should be one or the other (JB Oct 08/99)
+
++ add imap server code (JB && Shaleh Oct 11/99)
+

@@ -233,37 +233,59 @@ int
 unixmbox_expunge (mailbox * mbox)
 unixmbox_expunge (mailbox * mbox)
 {
 {
   unixmbox_data *data;
   unixmbox_data *data;
-  int i = 0, size = 0;
+  int i = 0;
+  ssize_t size = 0, size_read = 0;
   char *buf = NULL;
   char *buf = NULL;
-  fpos_t lastpos;
+  int file;
+  int deletion_needed = 0; /* true when a deleted message has been found */
+  size_t buff_size = 0;
+  size_t tmp = 0;
 
 
   if (mbox == NULL)
   if (mbox == NULL)
     {
     {
       errno = EINVAL;
       errno = EINVAL;
 	  return -1;
 	  return -1;
     }
     }
-  data = mbox->_data;
-  data->file = freopen (mbox->name, "r+", data->file);
-  if (data->file == NULL)
+  if (mbox->num_deleted)
   {
   {
+    data = mbox->_data;
+    fclose(data->file);
+    /* error handling */
+    data->file = NULL;
+    file = open(mbox->name, O_RDWR);
     /* error handling */
     /* error handling */
-    }
-  fgetpos (data->file, &lastpos);
 
 
   for (i = 0; i < mbox->messages; i++)
   for (i = 0; i < mbox->messages; i++)
     {
     {
       if (data->messages[i].deleted == 0)
       if (data->messages[i].deleted == 0)
 	{
 	{
-	  fgetpos (data->file, &lastpos);
-	  fsetpos (data->file, &(data->messages[i].header));
-	  read (fileno (data->file), buf,
-		data->messages[i + 1].header - data->messages[i].header);
-	  fprintf (data->file, "%s", buf);
-	  size += strlen (buf);
-	  free (buf);
+      if (deletion_needed)
+      {
+        tmp = data->messages[i + 1].header - data->messages[i].header;
+		if (tmp > buff_size)
+          {
+            buff_size = tmp;
+            buf = realloc (buf, tmp);
+			/* error checking */
           }
           }
+        lseek (file, data->messages[i].header, SEEK_SET);
+        size_read = read (file, buf, tmp);
+		/* error checking */
+		lseek (file, size, SEEK_SET);
+        write (file, buf, size_read);
+		/* error checking */
+      	size += size_read;
+      }
+	}
+	  else
+    {
+        deletion_needed = 1;
+    }
+    }
+    close (file);
+    truncate (mbox->name, size);
+    free (buf);
   }
   }
-  ftruncate (fileno (data->file), size);
   return 0;
   return 0;
 }
 }
 
 
@@ -280,6 +302,8 @@ unixmbox_is_deleted (mailbox * mbox, unsigned int num)
       errno = EINVAL;
       errno = EINVAL;
       return -1;
       return -1;
     }
     }
+  if (mbox->num_deleted == 0)
+    return 0;
   data = mbox->_data;
   data = mbox->_data;
   return (data->messages[num].deleted == 1);
   return (data->messages[num].deleted == 1);
 }
 }

@@ -42,6 +42,10 @@
 #include <strings.h>
 #include <strings.h>
 #endif
 #endif
 
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 typedef struct _unixmbox_message
 typedef struct _unixmbox_message
   {
   {
     off_t header;
     off_t header;

@@ -19,6 +19,7 @@
 #include <config.h>
 #include <config.h>
 #endif
 #endif
 
 
+#include <errno.h>
 #include <mailbox.h>
 #include <mailbox.h>
 #include <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
@@ -86,6 +87,11 @@ Report bugs to <bug-mailutils@gnu.org>.\n");
     }
     }
 
 
   mbox = mbox_open (mboxname);
   mbox = mbox_open (mboxname);
+  if (mbox == NULL)
+    {
+      fprintf (stderr, "Ack, %s, reading %s\n", strerror(errno), mboxname);
+	  exit (1);
+    }
   printf ("Number of messages: %d\n", mbox->messages);
   printf ("Number of messages: %d\n", mbox->messages);
   while (1)
   while (1)
     {
     {