X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Frmt.c;h=1088fa1622976c7da0abd9be2375eadd4614de93;hb=236deef28ef1d0438aee02729e0a377636962b1a;hp=e49f3c2dae81a799499d223d085c8057ce85b6dc;hpb=45dd602433099e8bbf6924a0896655c693057c69;p=chaz%2Ftar

diff --git a/src/rmt.c b/src/rmt.c
index e49f3c2..1088fa1 100644
--- a/src/rmt.c
+++ b/src/rmt.c
@@ -262,7 +262,7 @@ Manipulate a tape drive, accepting commands from a remote process.\n\
   --version  Output version info.\n\
   --help  Output this help.\n"),
 	      program_name);
-      fputs (_("\nReport bugs to <bug-tar@gnu.org>.\n"), stdout);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
 
   exit (status);
@@ -293,8 +293,8 @@ main (int argc, char *const *argv)
       
     case 'v':
       {
-	printf ("rmt (GNU %s) %s\n", 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: