Drop en_GB locale; it was more trouble than it was worth (e.g., different

[chaz/tar] / src / rmt.c

diff --git a/src/rmt.c b/src/rmt.c
index 81add7940a93c1ff5869640e10210e1c30c74616..f487b2c39e3ec3e7394adf03b729f7c18632147b 100644 (file)
--- a/src/rmt.c
+++ b/src/rmt.c
@@ -1,7 +1,7 @@
 /* Remote connection server.
 
-   Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001 Free Software
-   Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -32,7 +32,6 @@
    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  */
 
 #include "system.h"
-#include <copysym.h>
 #include <localedir.h>
 #include <safe-read.h>
 #include <full-write.h>
@@ -130,7 +129,7 @@ get_string (char *string)
 }
 
 static void
-prepare_record_buffer (size_t size)
+prepare_input_buffer (int fd, size_t size)
 {
   if (size <= allocated_size)
     return;
@@ -151,14 +150,14 @@ prepare_record_buffer (size_t size)
   allocated_size = size;
 
 #ifdef SO_RCVBUF
-  while (size > 1024 &&
-        (setsockopt (STDIN_FILENO, SOL_SOCKET, SO_RCVBUF,
-                     (char *) &size, sizeof size)
-         < 0))
-    size -= 1024;
-#else
-  /* FIXME: I do not see any purpose to the following line...  Sigh! */
-  size = 1 + ((size - 1) % 1024);
+  if (0 <= fd)
+    {
+      int isize = size < INT_MAX ? size : INT_MAX;
+      while (setsockopt (fd, SOL_SOCKET, SO_RCVBUF,
+                        (char *) &isize, sizeof isize)
+            && 1024 < isize)
+       isize >>= 1;
+    }
 #endif
 }
 
@@ -263,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);
@@ -294,10 +293,8 @@ main (int argc, char *const *argv)
       
     case 'v':
       {
-       char buf[MB_LEN_MAX + 1];
-       printf ("rmt (GNU %s) %s\n", PACKAGE, VERSION);
-       printf ("Copyright %s 2001 Free Software Foundation, Inc.\n",
-               copyright_symbol (buf, sizeof buf));
+       printf ("rmt (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+       printf (_("Copyright (C) %d Free Software Foundation, Inc.\n"), 2003);
        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\
@@ -442,7 +439,7 @@ top:
        size = atol (count_string);
        DEBUG1 ("rmtd: W %s\n", count_string);
 
-       prepare_record_buffer (size);
+       prepare_input_buffer (STDIN_FILENO, size);
        for (counter = 0; counter < size; counter += status)
          {
            status = safe_read (STDIN_FILENO, &record_buffer[counter],
@@ -470,7 +467,7 @@ top:
        DEBUG1 ("rmtd: R %s\n", count_string);
 
        size = atol (count_string);
-       prepare_record_buffer (size);
+       prepare_input_buffer (-1, size);
        status = safe_read (tape, record_buffer, size);
        if (status < 0)
          goto ioerror;