(Program Modes): Replace inforef to emacs-xtra by conditional xref's, depending

[gnu-emacs] / lib-src / cvtmail.c

diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index b967f81d4288acf303fd6922b67be1e6c5e9e784..c9f4f3713a7663cd617538c28f00b5c77b5a8099 100644 (file)
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1985, 1994 Free Software Foundation
+/* Copyright (C) 1985, 1994, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -14,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* cvtmail:
  * Program to convert oldstyle goslings emacs mail directories into
@@ -29,19 +30,18 @@ Boston, MA 02111-1307, USA.  */
  *
  * In order to get rmail to read the messages, the resulting file must
  * be mv'ed to ~/mbox, and then have rmail invoked on them.
- * 
+ *
  * Author: Larry Kolodney, 1985
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
 #ifndef HAVE_STDLIB_H
-char *malloc ();
-char *realloc ();
 char *getenv ();
-#else
-#include <stdlib.h>
 #endif
 
 char *xmalloc __P ((unsigned));
@@ -119,8 +119,8 @@ main (argc, argv)
        }
     }
   fclose (mddf);
-  fclose (mfilef);    
-  return 0;
+  fclose (mfilef);
+  return EXIT_SUCCESS;
 }
 
 void
@@ -149,7 +149,7 @@ fatal (s1, s2)
      char *s1, *s2;
 {
   error (s1, s2);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 void
@@ -158,14 +158,14 @@ sysfail (s)
 {
   fprintf (stderr, "cvtmail: ");
   perror (s);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 char *
 xmalloc (size)
      unsigned size;
 {
-  char *result = malloc (size);
+  char *result = (char *) malloc (size);
   if (!result)
     fatal ("virtual memory exhausted", 0);
   return result;
@@ -176,8 +176,13 @@ xrealloc (ptr, size)
      char *ptr;
      unsigned size;
 {
-  char *result = realloc (ptr, size);
+  char *result = (char *) realloc (ptr, size);
   if (!result)
     fatal ("virtual memory exhausted", 0);
   return result;
 }
+
+/* arch-tag: b93c25a9-9012-44f1-b78b-9cc7aed44a7a
+   (do not change this comment) */
+
+/* cvtmail.c ends here */