The FILE* stream "stdout" is not an lvalue so it is an error to

        attempt to assign to it.  To be able to redirect at will stdout
        we need to assign it.  In GNU lib C, it was not error since stdout
        stderr, and stdin are variables, but to be portable we can not
        assume this.  The way out is to always use fprintf () and have
        a global varialbe "ofile" pointing to stdout.

        * mail/*: All the files under mail been change to use fprintf()
        and ofile as the default stdout.
        Copyright updated.

49 files changed, 159 insertions, 126 deletions

diff --git a/ChangeLog b/ChangeLog
index 268688c08..3b3886fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2001-04-15  Alain Magloire
 
+	The FILE* stream "stdout" is not an lvalue so it is an error to
+	attempt to assign to it.  To be able to redirect at will stdout
+	we need to assign it.  In GNU lib C, it was not error since stdout
+	stderr, and stdin are variables, but to be portable we can not
+	assume this.  The way out is to always use fprintf () and have
+	a global varialbe "ofile" pointing to stdout.
+
+	* mail/*: All the files under mail been change to use fprintf()
+	and ofile as the default stdout.
+	Copyright updated.
+
+2001-04-15  Alain Magloire
+
 	Create a argp directory, it contains the necessary
 	files to build a standalone libargp.a
 
diff --git a/argp/Makefile.am b/argp/Makefile.am
index 934310c9b..1204127e3 100644
--- a/argp/Makefile.am
+++ b/argp/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../lib/ansi2knr
 
 INCLUDES = -I${top_srcdir}/lib
 
-noinst_LIBRARIES =  @ARGPLIBS@
+noinst_LIBRARIES =  @ARGPLIB@
 
 libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c argp-fs-xinl.c \
  argp-help.c argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c pin.c
diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index e2e3bb689..ee7899bfa 100644
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -89,7 +89,7 @@ __argp_fmtstream_free (argp_fmtstream_t fs)
 {
   __argp_fmtstream_update (fs);
   if (fs->p > fs->buf)
-    fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
+    fwrite (fs->buf, 1, fs->p - fs->buf, fs->stream);
   free (fs->buf);
   free (fs);
 }
@@ -129,7 +129,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
 	      /* No buffer space for spaces.  Must flush.  */
 	      size_t i;
 	      for (i = 0; i < pad; i++)
-		putc_unlocked (' ', fs->stream);
+		putc (' ', fs->stream);
 	    }
 	  fs->point_col = pad;
 	}
@@ -263,8 +263,8 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
 		/* Output the first line so we can use the space.  */
 		{
 		  if (nl > fs->buf)
-		    fwrite_unlocked (fs->buf, 1, nl - fs->buf, fs->stream);
-		  putc_unlocked ('\n', fs->stream);
+		    fwrite (fs->buf, 1, nl - fs->buf, fs->stream);
+		  putc ('\n', fs->stream);
 		  len += buf - fs->buf;
 		  nl = buf = fs->buf;
 		}
@@ -281,7 +281,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
 	      *nl++ = ' ';
 	  else
 	    for (i = 0; i < fs->wmargin; ++i)
-	      putc_unlocked (' ', fs->stream);
+	      putc (' ', fs->stream);
 
 	  /* Copy the tail of the original buffer into the current buffer
 	     position.  */
@@ -318,7 +318,7 @@ __argp_fmtstream_ensure (struct argp_fmtstream *fs, size_t amount)
       /* Flush FS's buffer.  */
       __argp_fmtstream_update (fs);
 
-      wrote = fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
+      wrote = fwrite (fs->buf, 1, fs->p - fs->buf, fs->stream);
       if (wrote == fs->p - fs->buf)
 	{
 	  fs->p = fs->buf;
diff --git a/configure.in b/configure.in
index 5339cc240..cf472a36a 100644
--- a/configure.in
+++ b/configure.in
@@ -75,9 +75,11 @@ dnl Check for libraries
 AC_CHECK_FUNCS(argp_parse)
 if test x"$ac_cv_func_argp_parse" != xyes; then
 	AC_REPLACE_FUNCS(strndup strnlen strchrnul)
-	ARGPLIBS="libargp.a"
+	ARGPLIBS="../argp/libargp.a"
+	ARGPLIB="libargp.a"
 	ARGPINCS="-I../argp"
 	AC_SUBST(ARGPLIBS)
+	AC_SUBST(ARGPLIB)
 	AC_SUBST(ARGPINCS)
 fi
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1b5c06ae7..c83ccfd8f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 info_TEXINFOS = \
- mailutils.texi 
+ mailutils.texi
 
 EXTRA_DIST = \
  rfc1734.txt \
@@ -7,6 +7,7 @@ EXTRA_DIST = \
  rfc1957.txt \
  rfc2060.txt \
  rfc2449.txt \
+ address.texi \
  attribute.texi \
  auth.texi \
  body.texi \
@@ -15,6 +16,7 @@ EXTRA_DIST = \
  locker.texi \
  mailbox.texi \
  mailer.texi \
+ message.texi \
  sfrom.c.texi \
  stream.texi \
  url.texi \
diff --git a/mail/alias.c b/mail/alias.c
index a3069eceb..691977f28 100644
--- a/mail/alias.c
+++ b/mail/alias.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 int
 mail_alias (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/alt.c b/mail/alt.c
index cb237e68d..da460fed5 100644
--- a/mail/alt.c
+++ b/mail/alt.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 int
 mail_alt (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/copy.c b/mail/copy.c
index 802309bd3..c457b823b 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ mail_copy (int argc, char **argv)
   int *msglist = NULL;
   int num = 0, i = 0;
   int sender = 0;
-  
+
   if (isupper (argv[0][0]))
     sender = 1;
   else if (argc >= 2)
@@ -57,7 +57,7 @@ mail_copy (int argc, char **argv)
 
   mailbox_create (&mbx, filename);
   mailbox_open (mbx, MU_STREAM_WRITE | MU_STREAM_CREAT);
-  
+
   if (num > 0)
     {
       for (i=0; i < num; i++)
diff --git a/mail/delete.c b/mail/delete.c
index 1e5fa2a32..da576e8ab 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/mail/discard.c b/mail/discard.c
index 065750a64..263f55a0b 100644
--- a/mail/discard.c
+++ b/mail/discard.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 int
 mail_discard (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/dp.c b/mail/dp.c
index 7c6e18fc3..7a08a9a23 100644
--- a/mail/dp.c
+++ b/mail/dp.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/mail/echo.c b/mail/echo.c
index bda9106cf..588aa36bd 100644
--- a/mail/echo.c
+++ b/mail/echo.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@ mail_echo (int argc, char **argv)
   if (argc > 1)
     {
       for (i = 1; i < argc - 1; i++)
-	printf ("%s ", argv[i]);
-      printf ("%s\n", argv[argc - 1]);
+	fprintf (ofile, "%s ", argv[i]);
+      fprintf (ofile, "%s\n", argv[argc - 1]);
     }
   return 0;
 }
diff --git a/mail/edit.c b/mail/edit.c
index 5d86bb89e..ce2e71505 100644
--- a/mail/edit.c
+++ b/mail/edit.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/mail/eq.c b/mail/eq.c
index f23bca101..e4a81d8f3 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,6 +24,6 @@
 int
 mail_eq (int argc, char **argv)
 {
-  printf ("%d\n", realcursor);
+  fprintf (ofile, "%d\n", realcursor);
   return 0;
 }
diff --git a/mail/exit.c b/mail/exit.c
index 9bea66509..4597d8a31 100644
--- a/mail/exit.c
+++ b/mail/exit.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/mail/file.c b/mail/file.c
index 0e97253be..b887d611a 100644
--- a/mail/file.c
+++ b/mail/file.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/mail/folders.c b/mail/folders.c
index cae165b57..e8c645194 100644
--- a/mail/folders.c
+++ b/mail/folders.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 int
 mail_folders (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/followup.c b/mail/followup.c
index c10786e4f..a85fbfea2 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 int
 mail_followup (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/from.c b/mail/from.c
index 96f98e5bb..c9078868e 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -61,7 +61,8 @@ mail_from (int argc, char **argv)
       header_get_value (hdr, MU_HEADER_SUBJECT, subj, subjl, NULL);
 
       snprintf (format, 64, "%%c%%2d %%-%ds%%-%ds\n", froml, subjl);
-      printf (format, cursor == realcursor ? '>' : ' ', cursor, from, subj);
+      fprintf (ofile, format, cursor == realcursor ? '>' : ' ', cursor,
+	       from, subj);
 
       free (from);
       free (subj);
diff --git a/mail/headers.c b/mail/headers.c
index 6fed59edb..316ea435a 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ mail_headers (int argc, char **argv)
 	      low = high - lines;
 	    }
 	}
-      
+
       memset (buf, '\0', 64);
       snprintf (buf, 64, "from %d-%d", low, high);
       util_do_command (buf);
diff --git a/mail/help.c b/mail/help.c
index d02d8fcaa..134ea19e3 100644
--- a/mail/help.c
+++ b/mail/help.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ mail_help (int argc, char **argv)
     {
       int i = 0;
       while (mail_command_table[i].synopsis != 0)
-	printf ("%s\n", mail_command_table[i++].synopsis);
+	fprintf (ofile, "%s\n", mail_command_table[i++].synopsis);
       return 0;
     }
   else
@@ -39,11 +39,11 @@ mail_help (int argc, char **argv)
 	{
 	  struct mail_command_entry entry = util_find_entry (argv[cmd]);
 	  if (entry.synopsis != NULL)
-	    printf ("%s\n", entry.synopsis);
+	    fprintf (ofile, "%s\n", entry.synopsis);
 	  else
 	    {
 	      status = 1;
-	      printf ("Unknown command: %s\n", argv[cmd]);
+	      fprintf (ofile, "Unknown command: %s\n", argv[cmd]);
 	    }
 	}
       return status;
diff --git a/mail/hold.c b/mail/hold.c
index 0a1e6ba1e..53d63494b 100644
--- a/mail/hold.c
+++ b/mail/hold.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 int
 mail_hold (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/if.c b/mail/if.c
index 93aec9c70..21771a398 100644
--- a/mail/if.c
+++ b/mail/if.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 int
 mail_if (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/list.c b/mail/list.c
index 744f45106..45bc010c2 100644
--- a/mail/list.c
+++ b/mail/list.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,11 +45,11 @@ mail_list (int argc, char **argv)
       if (pos >= cols)
 	{
 	  pos = len + 1;
-	  printf ("\n%s ", cmd);
+	  fprintf (ofile, "\n%s ", cmd);
 	}
       else
-        printf ("%s ", cmd);
+        fprintf (ofile, "%s ", cmd);
     }
-  printf ("\n");
+  fprintf (ofile, "\n");
   return 0;
 }
diff --git a/mail/mail.c b/mail/mail.c
index f2ccdda9a..f569845ad 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -126,6 +126,7 @@ main (int argc, char **argv)
   int modelen = 0;
   struct arguments args;
 
+  ofile = stdout;
   cursor = 1;
   realcursor = cursor;
 
@@ -221,12 +222,12 @@ main (int argc, char **argv)
   /* Interactive mode */
   if (!(util_find_env("quiet"))->set)
     {
-      printf ("%s, Copyright (C) 2001 Free Software Foundation, Inc.\n"
-	      "mail comes with ABSOLUTELY NO WARRANTY; for details type\n"
-	      "'warranty'. This is free software, and you are welcome to\n"
-	      "redistribute it under certain conditions; type 'copying'\n"
-	      "for details.\n",
-	      argp_program_version);
+      fprintf (ofile, "%s, Copyright (C) 2001 Free Software Foundation, Inc.\n"
+	       "mail comes with ABSOLUTELY NO WARRANTY; for details type\n"
+	       "'warranty'. This is free software, and you are welcome to\n"
+	       "redistribute it under certain conditions; type 'copying'\n"
+	       "for details.\n",
+	       argp_program_version);
     }
 
   /* Mode is just sending */
diff --git a/mail/mail.h b/mail/mail.h
index 0980b9e17..83caf9c83 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -84,6 +84,7 @@ mailbox_t mbox;
 unsigned int cursor;
 unsigned int realcursor;
 unsigned int total;
+FILE *ofile;
 extern const struct mail_command_entry mail_command_table[];
 
 /* Functions */
diff --git a/mail/mbox.c b/mail/mbox.c
index db0eaa67b..2a2c2f707 100644
--- a/mail/mbox.c
+++ b/mail/mbox.c
@@ -1,5 +1,5 @@
 /* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 int
 mail_mbox (int argc, char **argv)
 {
-  printf ("Function not implemented in %s line %d\n", __FILE__, __LINE__);
+  fprintf (ofile, "Function not implemented in %s line %d\n",
+	   __FILE__, __LINE__);
   return 1;
 }
diff --git a/mail/next.c b/mail/next.c
index 5c9b1088f..0e71595f8 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #include "mail.h"
 
 /*
- * n[ext] [message] 
+ * n[ext] [message]
  * +
  */
 
diff --git a/mail/pipe.c b/mail/pipe.c
index 4e39b646f..0fc4c6800 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 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ mail_pipe (int argc, char **argv)
 	  off += n;
 	}
     }
-    
+
   free (list);
   pclose (