1 files changed, 22 insertions, 18 deletions

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 2d0cd9043fd..a634e2966d7 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -216,7 +216,7 @@ main (argc, argv)
         preserve_mail++;
         break;
       default:
-        exit(1);
+        exit (EXIT_FAILURE);
       }
     }
 
@@ -234,7 +234,7 @@ main (argc, argv)
 #else
       fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n", "");
 #endif
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 
   inname = argv[optind];
@@ -536,12 +536,12 @@ main (argc, argv)
       if (spool_name)
         mailunlock ();
 #endif
-      exit (0);
+      exit (EXIT_SUCCESS);
     }
 
   wait (&status);
   if (!WIFEXITED (status))
-    exit (1);
+    exit (EXIT_FAILURE);
   else if (WRETCODE (status) != 0)
     exit (WRETCODE (status));
 
@@ -554,7 +554,7 @@ main (argc, argv)
 
 #endif /* ! DISABLE_DIRECT_ACCESS */
 
-  return 0;
+  return EXIT_SUCCESS;
 }
 
 #ifdef MAIL_USE_MAILLOCK
@@ -607,7 +607,7 @@ fatal (s1, s2)
   if (delete_lockname)
     unlink (delete_lockname);
   error (s1, s2, 0);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 /* Print error message.  `s1' is printf control string, `s2' and `s3'
@@ -709,6 +709,8 @@ char Errmsg[200];		/* POP errors, at least, can exceed
  * If the mailbox is in the form "po:username:hostname", then it is
  * modified by this function -- the second colon is replaced by a
  * null.
+ *
+ * Return a value suitable for passing to `exit'.
  */
 
 int
@@ -736,19 +738,19 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
   if (! server)
     {
       error ("Error connecting to POP server: %s", pop_error, 0);
-      return (1);
+      return EXIT_FAILURE;
     }
 
   if (pop_stat (server, &nmsgs, &nbytes))
     {
       error ("Error getting message count from POP server: %s", pop_error, 0);
-      return (1);
+      return EXIT_FAILURE;
     }
 
   if (!nmsgs)
     {
       pop_close (server);
-      return (0);
+      return EXIT_SUCCESS;
     }
 
   mbfi = open (outfile, O_WRONLY | O_CREAT | O_EXCL, 0666);
@@ -756,7 +758,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
     {
       pop_close (server);
       error ("Error in open: %s, %s", strerror (errno), outfile);
-      return (1);
+      return EXIT_FAILURE;
     }
   fchown (mbfi, getuid (), -1);
 
@@ -766,7 +768,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
       error ("Error in fdopen: %s", strerror (errno), 0);
       close (mbfi);
       unlink (outfile);
-      return (1);
+      return EXIT_FAILURE;
     }
 
   if (reverse_order)
@@ -789,7 +791,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
         {
           error (Errmsg, 0, 0);
           close (mbfi);
-          return (1);
+          return EXIT_FAILURE;
         }
       mbx_delimit_end (mbf);
       fflush (mbf);
@@ -798,7 +800,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
           error ("Error in fflush: %s", strerror (errno), 0);
           pop_close (server);
           close (mbfi);
-          return (1);
+          return EXIT_FAILURE;
         }
     }
 
@@ -812,14 +814,14 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
   if (fsync (mbfi) < 0)
     {
       error ("Error in fsync: %s", strerror (errno), 0);
-      return (1);
+      return EXIT_FAILURE;
     }
 #endif
 
   if (close (mbfi) == -1)
     {
       error ("Error in close: %s", strerror (errno), 0);
-      return (1);
+      return EXIT_FAILURE;
     }
 
   if (! preserve)
@@ -829,17 +831,17 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
           {
             error ("Error from POP server: %s", pop_error, 0);
             pop_close (server);
-            return (1);
+            return EXIT_FAILURE;
           }
       }
 
   if (pop_quit (server))
     {
       error ("Error from POP server: %s", pop_error, 0);
-      return (1);
+      return EXIT_FAILURE;
     }
 
-  return (0);
+  return EXIT_SUCCESS;
 }
 
 int
@@ -957,3 +959,5 @@ strerror (errnum)
 
 /* arch-tag: 1c323112-41fe-4fe5-8de9-494de631f73f
    (do not change this comment) */
+
+/* movemail.c ends here */