/* 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
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */
#include "system.h"
-#include <copysym.h>
#include <localedir.h>
#include <safe-read.h>
#include <full-write.h>
}
static void
-prepare_record_buffer (size_t size)
+prepare_input_buffer (int fd, size_t size)
{
if (size <= allocated_size)
return;
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
}
--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);
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%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\
if (debug_file == 0)
{
report_numbered_error (errno);
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
}
setbuf (debug_file, 0);
}
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;
}
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)
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],
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);
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;
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;
}
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);
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: