(safer_name_suffix): Skip leading ./

[chaz/tar] / src / rmt.c

diff --git a/src/rmt.c b/src/rmt.c
index f487b2c39e3ec3e7394adf03b729f7c18632147b..1088fa1622976c7da0abd9be2375eadd4614de93 100644 (file)
--- a/src/rmt.c
+++ b/src/rmt.c
@@ -293,8 +293,8 @@ main (int argc, char *const *argv)
       
     case 'v':
       {
-       printf ("rmt (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-       printf (_("Copyright (C) %d Free Software Foundation, Inc.\n"), 2003);
+       printf ("rmt (%s) %s\n%s\n", PACKAGE_NAME, PACKAGE_VERSION,
+               "Copyright (C) 2003 Free Software Foundation, Inc.");
        puts (_("\
 This program comes with NO WARRANTY, to the extent permitted by law.\n\
 You may redistribute it under the terms of the GNU General Public License;\n\
@@ -314,7 +314,7 @@ see the file named COPYING for details."));
       if (debug_file == 0)
        {
          report_numbered_error (errno);
-         exit (EXIT_FAILURE);
+         return EXIT_FAILURE;
        }
       setbuf (debug_file, 0);
     }
@@ -395,7 +395,7 @@ top:
                if (c10 / 10 != count || (negative ? c10 < nc : nc < c10))
                  {
                    report_error_message (N_("Seek offset out of range"));
-                   exit (EXIT_FAILURE);
+                   return EXIT_FAILURE;
                  }
                count = nc;
              }
@@ -408,7 +408,7 @@ top:
          case 2: whence = SEEK_END; break;
          default:
            report_error_message (N_("Seek direction out of range"));
-           exit (EXIT_FAILURE);
+           return EXIT_FAILURE;
          }
        count = lseek (tape, count, whence);
        if (count < 0)
@@ -449,7 +449,7 @@ top:
                DEBUG (_("rmtd: Premature eof\n"));
 
                report_error_message (N_("Premature end of file"));
-               exit (EXIT_FAILURE); /* exit status used to be 2 */
+               return EXIT_FAILURE; /* exit status used to be 2 */
              }
          }
        status = full_write (tape, record_buffer, size);
@@ -515,7 +515,7 @@ top:
                  if (c10 / 10 != count || (negative ? c10 < nc : nc < c10))
                    {
                      report_error_message (N_("Seek offset out of range"));
-                     exit (EXIT_FAILURE);
+                     return EXIT_FAILURE;
                    }
                  count = nc;
                }
@@ -525,7 +525,7 @@ top:
          if (mtop.mt_count != count)
            {
              report_error_message (N_("Seek offset out of range"));
-             exit (EXIT_FAILURE);
+             return EXIT_FAILURE;
            }
          mtop.mt_op = atoi (operation_string);
 
@@ -559,7 +559,7 @@ top:
       DEBUG1 (_("rmtd: Garbage command %c\n"), command);
 
       report_error_message (N_("Garbage command"));
-      exit (EXIT_FAILURE);     /* exit status used to be 3 */
+      return EXIT_FAILURE;     /* exit status used to be 3 */
     }
 
 respond: