Merge from emacs--rel--22

[bpt/emacs.git] / lib-src / cvtmail.c

diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 5a4d3c7..0d436ef 100644 (file)
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 1985, 1994 Free Software Foundation
+/* Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
 
 /* cvtmail:
  * Program to convert oldstyle goslings emacs mail directories into
@@ -119,7 +119,7 @@ main (argc, argv)
     }
   fclose (mddf);
   fclose (mfilef);
-  return 0;
+  return EXIT_SUCCESS;
 }
 
 void
@@ -148,7 +148,7 @@ fatal (s1, s2)
      char *s1, *s2;
 {
   error (s1, s2);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 void
@@ -157,7 +157,7 @@ sysfail (s)
 {
   fprintf (stderr, "cvtmail: ");
   perror (s);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 char *
@@ -180,3 +180,8 @@ xrealloc (ptr, size)
     fatal ("virtual memory exhausted", 0);
   return result;
 }
+
+/* arch-tag: b93c25a9-9012-44f1-b78b-9cc7aed44a7a
+   (do not change this comment) */
+
+/* cvtmail.c ends here */