Updated calls to msgset_parse

13 files changed, 34 insertions, 34 deletions

diff --git a/mail/copy.c b/mail/copy.c
index 63ace3937..80411933d 100644
--- a/mail/copy.c
+++ b/mail/copy.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ mail_copy0 (int argc, char **argv, int mark)
   else
     filename = strdup ("mbox");
 
-  if (msgset_parse (argc, argv, &msglist))
+  if (msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &msglist))
     {
       if (filename)
 	free (filename);
@@ -74,7 +74,7 @@ mail_copy0 (int argc, char **argv, int mark)
     {
       int status;
       
-      status = util_get_message (mbox, mp->msg_part[0], &msg, MSG_NODELETED);
+      status = util_get_message (mbox, mp->msg_part[0], &msg);
       if (status)
         break;
 
diff --git a/mail/decode.c b/mail/decode.c
index 61b7244d7..071471853 100644
--- a/mail/decode.c
+++ b/mail/decode.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ mail_decode (int argc, char **argv)
   msgset_t *msgset;
   struct decode_closure decode_closure;
 
-  if (msgset_parse (argc, argv, &msgset))
+  if (msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &msgset))
     return 1;
 
   decode_closure.select_hdr = islower (argv[0][0]);
diff --git a/mail/delete.c b/mail/delete.c
index 71cb15e18..96bf1d5ff 100644
--- a/mail/delete.c
+++ b/mail/delete.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ int
 mail_delete (int argc, char **argv)
 {
   int reset_cursor = 0;
-  int rc = util_foreach_msg (argc, argv, MSG_NODELETED,
+  int rc = util_foreach_msg (argc, argv, MSG_NODELETED|MSG_SILENT,
 			     mail_delete_msg, &reset_cursor);
   
   /* Readjust the cursor not to point to the deleted messages.  */
diff --git a/mail/eq.c b/mail/eq.c
index 9181f931d..07d64ba17 100644
--- a/mail/eq.c
+++ b/mail/eq.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ mail_eq (int argc, char **argv)
       break;
 
     case 2:
-      if (msgset_parse (argc, argv, &list) == 0)
+      if (msgset_parse (argc, argv, MSG_NODELETED, &list) == 0)
 	{
 	  if (list->msg_part[0] <= total)
 	    {
diff --git a/mail/followup.c b/mail/followup.c
index ae3d276a3..dd2223b7a 100644
--- a/mail/followup.c
+++ b/mail/followup.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,10 +33,10 @@ mail_followup (int argc, char **argv)
   int status;
 
   compose_init (&env);
-  if (msgset_parse (argc, argv, &msglist))
+  if (msgset_parse (argc, argv, MSG_NODELETED, &msglist))
     return 1;
 
-  if (util_get_message (mbox, cursor, &msg, MSG_NODELETED))
+  if (util_get_message (mbox, cursor, &msg))
     {
       msgset_free (msglist);
       return 1;
diff --git a/mail/from.c b/mail/from.c
index 87cbd9a15..03da4e53b 100644
--- a/mail/from.c
+++ b/mail/from.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -111,6 +111,6 @@ mail_from0 (msgset_t *mspec, message_t msg, void *data)
 int
 mail_from (int argc, char **argv)
 {
-  return util_foreach_msg (argc, argv, MSG_NODELETED, mail_from0, NULL);
+  return util_foreach_msg (argc, argv, MSG_NODELETED|MSG_SILENT, mail_from0, NULL);
 }
 
diff --git a/mail/headers.c b/mail/headers.c
index a835ef8f0..acb3d84e4 100644
--- a/mail/headers.c
+++ b/mail/headers.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ mail_headers (int argc, char **argv)
   int lines = util_screen_lines ();
   int num;
 
-  if (msgset_parse (argc, argv, &list))
+  if (msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &list))
      return 1;
 
   num = 0;
diff --git a/mail/next.c b/mail/next.c
index a33e05547..0396714ed 100644
--- a/mail/next.c
+++ b/mail/next.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ mail_next (int argc, char **argv)
       int rc = 1;
       for (n = cursor + 1; n <= total; n++)
 	{
-	  rc = util_get_message (mbox, n, &msg, MSG_NODELETED|MSG_SILENT);
+	  rc = util_get_message (mbox, n, &msg);
 	  if (rc == 0)
 	    break;
 	}
@@ -47,10 +47,10 @@ mail_next (int argc, char **argv)
   else
     {
       msgset_t *list = NULL;
-      msgset_parse (argc, argv, &list);
+      msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &list);
       n = list->msg_part[0];
       msgset_free (list);
-      if (util_get_message (mbox, n, &msg, MSG_NODELETED|MSG_SILENT))
+      if (util_get_message (mbox, n, &msg))
 	return 1;
     }
   cursor = n;
diff --git a/mail/pipe.c b/mail/pipe.c
index bc2c48e10..eb71bc3f9 100644
--- a/mail/pipe.c
+++ b/mail/pipe.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -39,14 +39,14 @@ mail_pipe (int argc, char **argv)
   else if (util_getenv (&cmd, "cmd", Mail_env_boolean, 1))
     return 1;
 
-  if (msgset_parse (argc, argv, &list))
+  if (msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &list))
       return 1;
 
   tube = popen (cmd, "w");
 
   for (mp = list; mp; mp = mp->next)
     {
-      if (util_get_message (mbox, mp->msg_part[0], &msg, MSG_NODELETED) == 0)
+      if (util_get_message (mbox, mp->msg_part[0], &msg) == 0)
 	{
 	  message_get_stream (msg, &stream);
 	  off = 0;
diff --git a/mail/previous.c b/mail/previous.c
index e03947609..3c2fd0157 100644
--- a/mail/previous.c
+++ b/mail/previous.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ mail_previous (int argc, char **argv)
       int rc = 1;
       for (n = cursor - 1; n > 0; n--)
 	{
-	  rc = util_get_message (mbox, n, &msg, MSG_NODELETED|MSG_SILENT);
+	  rc = util_get_message (mbox, n, &msg);
 	  if (rc == 0)
 	    break;
 	}
@@ -47,10 +47,10 @@ mail_previous (int argc, char **argv)
   else
     {
       msgset_t *list = NULL;
-      msgset_parse (argc, argv, &list);
+      msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &list);
       n = list->msg_part[0];
       msgset_free (list);
-      if (util_get_message (mbox, n, &msg, MSG_NODELETED|MSG_SILENT))
+      if (util_get_message (mbox, n, &msg))
 	return 1;
     }
   cursor = n;
diff --git a/mail/quit.c b/mail/quit.c
index f0492af5e..ce32c06b6 100644
--- a/mail/quit.c
+++ b/mail/quit.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -89,7 +89,7 @@ mail_mbox_commit ()
 
   for (i = 1; i <= total; i++)
     {
-      if (util_get_message (mbox, i, &msg, MSG_ALL))
+      if (util_get_message (mbox, i, &msg))
 	return 1;
 
       message_get_attribute (msg, &attr);
diff --git a/mail/tag.c b/mail/tag.c
index 765511411..5bd60a244 100644
--- a/mail/tag.c
+++ b/mail/tag.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ mail_tag (int argc, char **argv)
   msgset_t *msgset;
   int action = argv[0][0] != 'u';
 
-  if (msgset_parse (argc, argv, &msgset))
+  if (msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &msgset))
     return 1;
 
   util_msgset_iterate (msgset, tag_message, (void *)&action);
diff --git a/mail/write.c b/mail/write.c
index 9f93b13f9..a2db9426e 100644
--- a/mail/write.c
+++ b/mail/write.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ mail_write (int argc, char **argv)
       free (p);
     }
 		
-  if (msgset_parse (argc, argv, &msglist))
+  if (msgset_parse (argc, argv, MSG_NODELETED|MSG_SILENT, &msglist))
     {
       if (filename)
           free (filename);
@@ -81,7 +81,7 @@ mail_write (int argc, char **argv)
       off_t off = 0;
       size_t n = 0;
 
-      if (util_get_message (mbox, mp->msg_part[0], &msg, MSG_NODELETED))
+      if (util_get_message (mbox, mp->msg_part[0], &msg))
         continue;
 
       message_get_body (msg, &bod);