Use exit codes consistenly.

4 files changed, 102 insertions, 88 deletions

diff --git a/src/copyin.c b/src/copyin.c
index 3282816..78ffdd7 100644
--- a/src/copyin.c
+++ b/src/copyin.c
@@ -956,7 +956,7 @@ read_in_header (struct cpio_file_stat *file_hdr, int in_des)
         {
           peeked_bytes = tape_buffered_peek (tmpbuf, in_des, 512);
           if (peeked_bytes < 6)
-            error (1, 0, _("premature end of archive"));
+            error (PAXEXIT_FAILURE, 0, _("premature end of archive"));
 
           if (!strncmp (tmpbuf, "070701", 6))
             archive_format = arf_newascii;
@@ -1289,7 +1289,7 @@ process_copy_in ()
       rename_in = fopen (rename_batch_file, "r");
       if (rename_in == NULL)
         {
-          error (2, errno, TTY_NAME);
+          error (PAXEXIT_FAILURE, errno, TTY_NAME);
         }
     }
   else if (rename_flag)
@@ -1298,12 +1298,12 @@ process_copy_in ()
       tty_in = fopen (TTY_NAME, "r");
       if (tty_in == NULL)
         {
-          error (2, errno, TTY_NAME);
+          error (PAXEXIT_FAILURE, errno, TTY_NAME);
         }
       tty_out = fopen (TTY_NAME, "w");
       if (tty_out == NULL)
         {
-          error (2, errno, TTY_NAME);
+          error (PAXEXIT_FAILURE, errno, TTY_NAME);
         }
     }
 
@@ -1323,7 +1323,7 @@ process_copy_in ()
   else
     {
       if (fstat (in_file_des, &file_stat))
-        error (1, errno, _("standard input is closed"));
+        error (PAXEXIT_FAILURE, errno, _("standard input is closed"));
       input_is_special =
 #ifdef S_ISBLK
         S_ISBLK (file_stat.st_mode) ||
diff --git a/src/copyout.c b/src/copyout.c
index a5a8931..63785ff 100644
--- a/src/copyout.c
+++ b/src/copyout.c
@@ -48,7 +48,7 @@ read_for_checksum (int in_file_des, int file_size, char *file_name)
     {
       bytes_read = read (in_file_des, buf, BUFSIZ);
       if (bytes_read < 0)
-        error (1, errno, _("cannot read checksum for %s"), file_name);
+        error (PAXEXIT_FAILURE, errno, _("cannot read checksum for %s"), file_name);
       if (bytes_read == 0)
         break;
       if (bytes_left < bytes_read)
@@ -57,7 +57,7 @@ read_for_checksum (int in_file_des, int file_size, char *file_name)
         crc += buf[i] & 0xff;
     }
   if (lseek (in_file_des, 0L, SEEK_SET))
-    error (1, errno, _("cannot read checksum for %s"), file_name);
+    error (PAXEXIT_FAILURE, errno, _("cannot read checksum for %s"), file_name);
 
   return crc;
 }
@@ -606,7 +606,7 @@ process_copy_out ()
   else
     {
       if (fstat (out_file_des, &file_stat))
-        error (1, errno, _("standard output is closed"));
+        error (PAXEXIT_FAILURE, errno, _("standard output is closed"));
       output_is_special =
 #ifdef S_ISBLK
         S_ISBLK (file_stat.st_mode) ||
diff --git a/src/main.c b/src/main.c
index d352e25..25320b5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,6 +36,7 @@
 #endif
 
 #include <progname.h>
+#include <closeout.h>
 
 #include "filetypes.h"
 #include "cpiohdr.h"
@@ -80,11 +81,13 @@ Examples:\n\
   # Copy files named in name-list to destination-directory\n\
   cpio -p destination-directory < name-list\n");
 
+static void usage (int status);
+
 /*  Print usage error message and exit with error.  */
 
 #define CHECK_USAGE(cond, opt, mode_opt) \
  if (cond) \
-   ERROR((PAXEXIT_FAILURE, 0, _("%s is meaningless with %s"), opt, mode_opt));
+   USAGE_ERROR ((0, 0, _("%s is meaningless with %s"), opt, mode_opt));
 
 static struct argp_option options[] = {
   /* ********** */
@@ -309,13 +312,13 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case BLOCK_SIZE_OPTION:             /* --block-size */
       io_block_size = atoi (arg);
       if (io_block_size < 1)
-        error (2, 0, _("invalid block size"));
+        USAGE_ERROR ((0, 0, _("invalid block size")));
       io_block_size *= 512;
       break;
 
     case 'c':           /* Use the old portable ASCII format.  */
       if (archive_format != arf_unknown)
-        error (0, EXIT_FAILURE, _("Archive format multiply defined"));
+        USAGE_ERROR ((0, 0, _("Archive format multiply defined")));
 #ifdef SVR4_COMPAT
       archive_format = arf_newascii; /* -H newc.  */
 #else
@@ -326,7 +329,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'C':           /* Block size.  */
       io_block_size = atoi (arg);
       if (io_block_size < 1)
-        error (2, 0, _("invalid block size"));
+        USAGE_ERROR ((0, 0, _("invalid block size")));
       break;
 
     case 'd':           /* Create directories where needed.  */
@@ -351,7 +354,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
     case 'H':           /* Header format name.  */
       if (archive_format != arf_unknown)
-        error (PAXEXIT_FAILURE, 0, _("Archive format multiply defined"));
+        USAGE_ERROR ((0, 0, _("Archive format multiply defined")));
       if (!strcasecmp (arg, "crc"))
         archive_format = arf_crcascii;
       else if (!strcasecmp (arg, "newc"))
@@ -369,14 +372,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
       else if (!strcasecmp (arg, "hpbin"))
         archive_format = arf_hpbinary;
       else
-        error (2, 0, _("\
+        USAGE_ERROR ((0, 0, _("\
 invalid archive format `%s'; valid formats are:\n\
-crc newc odc bin ustar tar (all-caps also recognized)"), arg);
+crc newc odc bin ustar tar (all-caps also recognized)"), arg));
       break;
           
     case 'i':           /* Copy-in mode.  */
       if (copy_function != 0)
-        error (PAXEXIT_FAILURE, 0, _("Mode already defined"));
+        USAGE_ERROR ((0, 0, _("Mode already defined")));
       copy_function = process_copy_in;
       break;
 
@@ -414,14 +417,14 @@ crc newc odc bin ustar tar (all-caps also recognized)"), arg);
       
     case NO_PRESERVE_OWNER_OPTION:              /* --no-preserve-owner */
       if (set_owner_flag || set_group_flag)
-        error (PAXEXIT_FAILURE, 0, 
-               _("--no-preserve-owner cannot be used with --owner"));
+        USAGE_ERROR ((0, 0,  
+                      _("--no-preserve-owner cannot be used with --owner")));
       no_chown_flag = true;
       break;
 
     case 'o':           /* Copy-out mode.  */
       if (copy_function != 0)
-        error (PAXEXIT_FAILURE, 0, _("Mode already defined"));
+        USAGE_ERROR ((0, 0, _("Mode already defined")));
       copy_function = process_copy_out;
       break;
 
@@ -435,7 +438,7 @@ crc newc odc bin ustar tar (all-caps also recognized)"), arg);
 
     case 'p':           /* Copy-pass mode.  */
       if (copy_function != 0)
-        error (PAXEXIT_FAILURE, 0, _("Mode already defined"));
+        USAGE_ERROR ((0, 0, _("Mode already defined")));
       copy_function = process_copy_pass;
       break;
           
@@ -457,15 +460,15 @@ crc newc odc bin ustar tar (all-caps also recognized)"), arg);
 
     case 'R':           /* Set the owner.  */
       if (no_chown_flag)
-        error (PAXEXIT_FAILURE, 0, 
-               _("--owner cannot be used with --no-preserve-owner"));
+        USAGE_ERROR ((0, 0,  
+                      _("--owner cannot be used with --no-preserve-owner")));
       else
         {
           char *e, *u, *g;