mailbox.c mailbox.h mailboxi.c mbx_imap.c mbx_mbox.c

 	mbx_mdir.c mbx_mmdf.c mbx_pop.c mbx_unix.c

introduce an implementation of mbx_unix

 /* GNU mailutils - a suite of utilities for electronic mail
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 
    This program is free software; you can redistribute it and/or modify
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published by
    it under the terms of the GNU Library General Public License as published by
@@ -24,57 +24,44 @@ mailbox_open (mailbox_t mbox, int flag)
 }
 }
 
 
 int
 int
-mailbox_close (mailbox_t mbox, int flag)
+mailbox_close (mailbox_t mbox)
 {
 {
-  return mbox->_close (mbox, flag);
-}
-
-
-/* type */
-int
-mailbox_get_type (mailbox_t mbox, int *type, char *desc, int offset, int len)
-{
-  return mbox->_get_type (mbox, type, desc, offset, len);
-}
-
-int
-mailbox_get_mtype (mailbox_t mbox, int *type, char **desc, int *len)
-{
-  return mbox->_get_mtype (mbox, type, desc, offset, len);
+  return mbox->_close (mbox);
 }
 }
 
 
 
 
 /* passwd */
 /* passwd */
 int
 int
-mailbox_get_passwd (mailbox_t mbox, char *passwd, int offset, int len)
+mailbox_get_passwd (mailbox_t mbox, char *passwd, size_t len, size_t *n)
 {
 {
-  return mbox->_get_passwd (mbox, passwd, offset, len);
+  return mbox->_get_passwd (mbox, passwd, len, n);
 }
 }
 
 
 int
 int
-mailbox_get_mpasswd (mailbox_t mbox, char **passwd, int *len)
+mailbox_get_mpasswd (mailbox_t mbox, char **passwd, size_t *n)
 {
 {
-  return mbox->_get_mpasswd (mbox, passwd, len);
+  return mbox->_get_mpasswd (mbox, passwd, n);
 }
 }
 
 
 int
 int
-mailbox_set_passwd  (mailbox_t mbox, const char *passwd, int offset, int len)
+mailbox_set_passwd  (mailbox_t mbox, const char *passwd,
+		     size_t len)
 {
 {
-  return mbox->_set_passwd (mbox, passwd, offset, len);
+  return mbox->_set_passwd (mbox, passwd, len);
 }
 }
 
 
 
 
 /* deleting */
 /* deleting */
 int
 int
-mailbox_delete (mailbox_t mbox, int id)
+mailbox_delete (mailbox_t mbox, size_t msgno)
 {
 {
-  return mbox->_delete (mbox, id);
+  return mbox->_delete (mbox, msgno);
 }
 }
 
 
 int
 int
-mailbox_undelete (mailbox_t mbox, int id)
+mailbox_undelete (mailbox_t mbox, size_t msgno)
 {
 {
-  return mbox->_undelete (mbox, id);
+  return mbox->_undelete (mbox, msgno);
 }
 }
 
 
 int
 int
@@ -84,69 +71,73 @@ mailbox_expunge (mailbox_t mbox)
 }
 }
 
 
 int
 int
-mailbox_is_deleted (mailbox_t mbox, int)
+mailbox_is_deleted (mailbox_t mbox, size_t msgno)
 {
 {
-  return mbox->_is_deleted (mbox, int);
+  return mbox->_is_deleted (mbox, msgno);
 }
 }
 
 
 
 
 /* appending */
 /* appending */
 int
 int
-mailbox_new_msg (mailbox_t mbox, int * id)
+mailbox_new_msg (mailbox_t mbox, size_t *msgno)
 {
 {
-  return mbox->_new_msg (mbox, id);
+  return mbox->_new_msg (mbox, msgno);
 }
 }
 
 
 int
 int
-mailbox_set_header (mailbox_t mbox, int id, const char *h,
-		    int offset, int n, int replace)
+mailbox_set_header (mailbox_t mbox, size_t msgno, const char *h,
+		    size_t len, int replace)
 {
 {
-  return mbox->_set_header (mbox, id, h, offset, n, replace);
+  return mbox->_set_header (mbox, msgno, h, len, replace);
 }
 }
 
 
 int
 int
-mailbox_set_body (mailbox_t mbox, int id, const char *b,
-		  int offset, int n, int replace)
+mailbox_set_body (mailbox_t mbox, size_t msgno, const char *b,
+		  size_t len, int replace)
 {
 {
-  return mbox->_set_body (mbox, id, b, offset, n, replace);
+  return mbox->_set_body (mbox, msgno, b, len, replace);
 }
 }
 
 
 int
 int
-mailbox_append (mailbox_t mbox, int id)
+mailbox_append (mailbox_t mbox, size_t msgno)
 {
 {
-  return mbox->_append (mbox, id);
+  return mbox->_append (mbox, msgno);
 }
 }
 
 
 int
 int
-mailbox_destroy_msg (mailbox_t mbox, int id)
+mailbox_destroy_msg (mailbox_t mbox, size_t msgno)
 {
 {
-  return mbox->_destroy_msg (mbox, id);
+  return mbox->_destroy_msg (mbox, msgno);
 }
 }
 
 
 
 
 /* reading */
 /* reading */
 int
 int
-mailbox_get_body (mailbox_t mbox, int id, char *b, int offset, int n)
+mailbox_get_body (mailbox_t mbox, size_t msgno, off_t off, char *b,
+		  size_t len, size_t *n)
 {
 {
-  return mbox->_get_body (mbox, id, b, offset, n);
+  return mbox->_get_body (mbox, msgno, off, b, len, n);
 }
 }
 
 
 int
 int
-mailbox_get_mbody (mailbox_t mbox, int id, char **b, int *n)
+mailbox_get_mbody (mailbox_t mbox, size_t msgno, off_t off,
+		   char **b, size_t *n)
 {
 {
-  return mbox->_get_body (mbox, id, b, n);
+  return mbox->_get_mbody (mbox, msgno, off, b, n);
 }
 }
 
 
 int
 int
-mailbox_get_header (mailbox_t mbox, int id, char *h, int offset, int n)
+mailbox_get_header (mailbox_t mbox, size_t msgno, off_t off, char *h,
+		    size_t len, size_t *n)
 {
 {
-  return mbox->_get_header (mbox, id, h, offset, n);
+  return mbox->_get_header (mbox, msgno, off, h, len, n);
 }
 }
 
 
 int
 int
-mailbox_get_mheader (mailbox_t mbox, int id, char **h, int *n)
+mailbox_get_mheader (mailbox_t mbox, size_t msgno, off_t off,
+		     char **h, size_t *n)
 {
 {
-  return mbox->_get_header (mbox, id, h, n);
+  return mbox->_get_mheader (mbox, msgno, off, h, n);
 }
 }
 
 
 
 
@@ -166,7 +157,7 @@ mailbox_unlock (mailbox_t mbox)
 
 
 /* misc */
 /* misc */
 int
 int
-mailbox_scan (mailbox_t mbox, int *msgs)
+mailbox_scan (mailbox_t mbox, size_t *msgs)
 {
 {
   return mbox->_scan (mbox, msgs);
   return mbox->_scan (mbox, msgs);
 }
 }
@@ -178,31 +169,32 @@ mailbox_is_updated (mailbox_t mbox)
 }
 }
 
 
 int
 int
-mailbox_get_timeout (mailbox_t mbox, int *timeout)
+mailbox_get_timeout (mailbox_t mbox, size_t *timeout)
 {
 {
   return mbox->_get_timeout (mbox, timeout);
   return mbox->_get_timeout (mbox, timeout);
 }
 }
 
 
 int
 int
-mailbox_set_timeout (mailbox_t mbox, int timeout)
+mailbox_set_timeout (mailbox_t mbox, size_t timeout)
 {
 {
   return mbox->_set_timeout (mbox, timeout);
   return mbox->_set_timeout (mbox, timeout);
 }
 }
 
 
 int
 int
-mailbox_get_refresh (mailbox_t mbox, int *refresh)
+mailbox_get_refresh (mailbox_t mbox, size_t *refresh)
 {
 {
   return mbox->_get_refresh (mbox, refresh);
   return mbox->_get_refresh (mbox, refresh);
 }
 }
 
 
 int
 int
-mailbox_set_refresh (mailbox_t mbox, int refresh)
+mailbox_set_refresh (mailbox_t mbox, size_t refresh)
 {
 {
   return mbox->_set_refresh (mbox, refresh);
   return mbox->_set_refresh (mbox, refresh);
 }
 }
 
 
 int
 int
-mailbox_set_notification (mailbox_t mbox, int (*notif) __P ((mailbox_t mbox)))
+mailbox_set_notification (mailbox_t mbox,
+			  int (*notif) __P ((mailbox_t, void *)))
 {
 {
   return mbox->_set_notification (mbox, notif);
   return mbox->_set_notification (mbox, notif);
 }
 }

 /* GNU mailutils - a suite of utilities for electronic mail
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 
    This program is free software; you can redistribute it and/or modify
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published by
    it under the terms of the GNU Library General Public License as published by
@@ -17,6 +17,7 @@
 
 
 #include <mbx_imap.h>
 #include <mbx_imap.h>
 #include <url_imap.h>
 #include <url_imap.h>
+#include <errno.h>
 
 
 
 
 struct mailbox_type _mailbox_imap_type =
 struct mailbox_type _mailbox_imap_type =
@@ -35,5 +36,5 @@ mailbox_imap_destroy (mailbox_t *mbox)
 int
 int
 mailbox_imap_init (mailbox_t *mbox, const char *name)
 mailbox_imap_init (mailbox_t *mbox, const char *name)
 {
 {
-  return -1;
+  return ENOSYS;
 }
 }

 /* GNU mailutils - a suite of utilities for electronic mail
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 
    This program is free software; you can redistribute it and/or modify
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published by
    it under the terms of the GNU Library General Public License as published by
@@ -59,7 +59,7 @@ mailbox_mbox_init (mailbox_t *mbox, const char *name)
   */
   */
   if (stat (name, &st) == -1)
   if (stat (name, &st) == -1)
     {
     {
-      return -1; /* errno set by stat () */
+      return errno; /* errno set by stat () */
     }
     }
 
 
   if (S_ISREG (st.st_mode))
   if (S_ISREG (st.st_mode))
@@ -77,7 +77,7 @@ mailbox_mbox_init (mailbox_t *mbox, const char *name)
       if (fd == -1)
       if (fd == -1)
 	{
 	{
 	  /* Oops !! wrong permission ? file deleted ? */
 	  /* Oops !! wrong permission ? file deleted ? */
-	  return -1; /* errno set by open () */
+	  return errno; /* errno set by open () */
 	}
 	}
 
 
       /* Read a small chunck */
       /* Read a small chunck */
@@ -91,6 +91,7 @@ mailbox_mbox_init (mailbox_t *mbox, const char *name)
       */
       */
       if (count == 0) /*empty file*/
       if (count == 0) /*empty file*/
 	{
 	{
+	  close (fd);
 	  return mailbox_unix_init (mbox, name);
 	  return mailbox_unix_init (mbox, name);
 	}
 	}
 
 
@@ -99,11 +100,13 @@ mailbox_mbox_init (mailbox_t *mbox, const char *name)
 	  if (strncmp (head, "From ", 5) == 0)
 	  if (strncmp (head, "From ", 5) == 0)
 	    {
 	    {
 	      /* This is Unix Mbox */
 	      /* This is Unix Mbox */
+	      close (fd);
 	      return mailbox_unix_init (mbox, name);
 	      return mailbox_unix_init (mbox, name);
 	    }
 	    }
 	}
 	}
 
 
       /* Try MMDF */
       /* Try MMDF */
+      close (fd);
 #endif
 #endif
       return mailbox_unix_init (mbox, name);
       return mailbox_unix_init (mbox, name);
     }
     }
@@ -121,5 +124,5 @@ mailbox_mbox_init (mailbox_t *mbox, const char *name)
 void
 void
 mailbox_mbox_destroy (mailbox_t *mbox)
 mailbox_mbox_destroy (mailbox_t *mbox)
 {
 {
-  return (*mbox)->mtype->_destroy (mbox);
+  (*mbox)->mtype->_destroy (mbox);
 }
 }

+/* GNU mailutils - a suite of utilities for electronic mail
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Library Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
 #include <url_mdir.h>
 #include <url_mdir.h>
 #include <mbx_mdir.h>
 #include <mbx_mdir.h>
+#include <errno.h>
 
 
 struct mailbox_type _mailbox_maildir_type =
 struct mailbox_type _mailbox_maildir_type =
 {
 {
@@ -11,7 +29,7 @@ struct mailbox_type _mailbox_maildir_type =
 int
 int
 mailbox_maildir_init (mailbox_t *mbox, const char *name)
 mailbox_maildir_init (mailbox_t *mbox, const char *name)
 {
 {
-  return -1;
+  return ENOSYS;
 }
 }
 
 
 void
 void

+/* GNU mailutils - a suite of utilities for electronic mail
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Library Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
 #include <url_mmdf.h>
 #include <url_mmdf.h>
 #include <mbx_mmdf.h>
 #include <mbx_mmdf.h>
+#include <errno.h>
 
 
-struct mailbox_type _mailbox_maildir_type =
+struct mailbox_type _mailbox_mmdf_type =
 {
 {
   "MMDF",
   "MMDF",
   (int)&_url_mmdf_type, &_url_mmdf_type,
   (int)&_url_mmdf_type, &_url_mmdf_type,
@@ -11,7 +29,7 @@ struct mailbox_type _mailbox_maildir_type =
 int
 int
 mailbox_mmdf_init (mailbox_t *mbox, const char *name)
 mailbox_mmdf_init (mailbox_t *mbox, const char *name)
 {
 {
-  return -1;
+  return ENOSYS;
 }
 }
 
 
 void
 void

 /* GNU mailutils - a suite of utilities for electronic mail
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 
    This program is free software; you can redistribute it and/or modify
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Library Public License as published by
    it under the terms of the GNU General Library Public License as published by
@@ -17,6 +17,7 @@
 
 
 #include <url_pop.h>
 #include <url_pop.h>
 #include <mbx_pop.h>
 #include <mbx_pop.h>
+#include <errno.h>
 
 
 struct mailbox_type _mailbox_pop_type =
 struct mailbox_type _mailbox_pop_type =
 {
 {
@@ -34,5 +35,5 @@ mailbox_pop_destroy (mailbox_t *mbox)
 int
 int
 mailbox_pop_init (mailbox_t *mbox, const char *name)
 mailbox_pop_init (mailbox_t *mbox, const char *name)
 {
 {
-  return -1;
+  return ENOSYS;
 }
 }