X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Frmt.c;h=79a933dcf6562a17d27fd8835f78069edf708776;hb=00ac26f00c4aba300cf841b0d761f2a6d55b5cc1;hp=b0ec6f98c3f7a5fd2d91b62639d829081b066b3d;hpb=d091cd947abe47b2ab6c305c6a8b16409acd68f4;p=chaz%2Ftar diff --git a/src/rmt.c b/src/rmt.c index b0ec6f9..79a933d 100644 --- a/src/rmt.c +++ b/src/rmt.c @@ -1,5 +1,7 @@ /* Remote connection server. - Copyright 1994, 1995, 1996, 1997, 1999 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 @@ -27,10 +29,14 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #include "system.h" +#include +#include +#include +#include #include #ifndef EXIT_FAILURE @@ -50,15 +56,15 @@ const char *program_name; static int tape = -1; /* Buffer containing transferred data, and its allocated size. */ -static char *record_buffer = NULL; -static size_t allocated_size = 0; +static char *record_buffer; +static size_t allocated_size; /* Buffer for constructing the reply. */ static char reply_buffer[BUFSIZ]; /* Debugging tools. */ -static FILE *debug_file = NULL; +static FILE *debug_file; #define DEBUG(File) \ if (debug_file) fprintf(debug_file, File) @@ -69,10 +75,7 @@ static FILE *debug_file = NULL; #define DEBUG2(File, Arg1, Arg2) \ if (debug_file) fprintf(debug_file, File, Arg1, Arg2) -/*------------------------------------------------. -| Return an error string, given an error number. | -`------------------------------------------------*/ - +/* Return an error string, given an error number. */ #if HAVE_STRERROR # ifndef strerror char *strerror (); @@ -91,10 +94,6 @@ private_strerror (int errnum) # define strerror private_strerror #endif -/*---. -| ? | -`---*/ - static void report_error_message (const char *string) { @@ -104,10 +103,6 @@ report_error_message (const char *string) full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); } -/*---. -| ? | -`---*/ - static void report_numbered_error (int num) { @@ -117,10 +112,6 @@ report_numbered_error (int num) full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); } -/*---. -| ? | -`---*/ - static void get_string (char *string) { @@ -128,7 +119,7 @@ get_string (char *string) for (counter = 0; counter < STRING_SIZE; counter++) { - if (full_read (STDIN_FILENO, string + counter, 1) != 1) + if (safe_read (STDIN_FILENO, string + counter, 1) != 1) exit (EXIT_SUCCESS); if (string[counter] == '\n') @@ -137,12 +128,8 @@ get_string (char *string) string[counter] = '\0'; } -/*---. -| ? | -`---*/ - static void -prepare_record_buffer (size_t size) +prepare_input_buffer (int fd, size_t size) { if (size <= allocated_size) return; @@ -152,7 +139,7 @@ prepare_record_buffer (size_t size) record_buffer = malloc (size); - if (record_buffer == NULL) + if (! record_buffer) { DEBUG (_("rmtd: Cannot allocate buffer space\n")); @@ -163,29 +150,132 @@ 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 } -/*---. -| ? | -`---*/ +/* Decode OFLAG_STRING, which represents the 2nd argument to `open'. + OFLAG_STRING should contain an optional integer, followed by an optional + symbolic representation of an open flag using only '|' to separate its + components (e.g. "O_WRONLY|O_CREAT|O_TRUNC"). Prefer the symbolic + representation if available, falling back on the numeric + representation, or to zero if both formats are absent. + + This function should be the inverse of encode_oflag. The numeric + representation is not portable from one host to another, but it is + for backward compatibility with old-fashioned clients that do not + emit symbolic open flags. */ + +static int +decode_oflag (char const *oflag_string) +{ + char *oflag_num_end; + int numeric_oflag = strtol (oflag_string, &oflag_num_end, 10); + int symbolic_oflag = 0; + + oflag_string = oflag_num_end; + while (ISSPACE ((unsigned char) *oflag_string)) + oflag_string++; + + do + { + struct name_value_pair { char const *name; int value; }; + static struct name_value_pair const table[] = + { +#ifdef O_APPEND + {"APPEND", O_APPEND}, +#endif + {"CREAT", O_CREAT}, +#ifdef O_DSYNC + {"DSYNC", O_DSYNC}, +#endif + {"EXCL", O_EXCL}, +#ifdef O_LARGEFILE + {"LARGEFILE", O_LARGEFILE}, /* LFS extension for opening large files */ +#endif +#ifdef O_NOCTTY + {"NOCTTY", O_NOCTTY}, +#endif +#ifdef O_NONBLOCK + {"NONBLOCK", O_NONBLOCK}, +#endif + {"RDONLY", O_RDONLY}, + {"RDWR", O_RDWR}, +#ifdef O_RSYNC + {"RSYNC", O_RSYNC}, +#endif +#ifdef O_SYNC + {"SYNC", O_SYNC}, +#endif + {"TRUNC", O_TRUNC}, + {"WRONLY", O_WRONLY} + }; + struct name_value_pair const *t; + size_t s; + + if (*oflag_string++ != 'O' || *oflag_string++ != '_') + return numeric_oflag; + + for (t = table; + (strncmp (oflag_string, t->name, s = strlen (t->name)) != 0 + || (oflag_string[s] + && strchr ("ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789", + oflag_string[s]))); + t++) + if (t == table + sizeof table / sizeof *table - 1) + return numeric_oflag; + + symbolic_oflag |= t->value; + oflag_string += s; + } + while (*oflag_string++ == '|'); + + return symbolic_oflag; +} + +static struct option const long_opts[] = +{ + {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'v'}, + {0, 0, 0, 0} +}; + +static void +usage (int status) +{ + if (status != EXIT_SUCCESS) + fprintf (stderr, _("Try `%s --help' for more information.\n"), + program_name); + else + { + printf (_("\ +Usage: %s [OPTION]\n\ +Manipulate a tape drive, accepting commands from a remote process.\n\ +\n\ + --version Output version info.\n\ + --help Output this help.\n"), + program_name); + printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); + } + + exit (status); +} int main (int argc, char *const *argv) { char command; - long status; + ssize_t status; - /* FIXME: Localisation is meaningless, unless --help and --version are - locally used. Localisation would be best accomplished by the calling + /* FIXME: Localization is meaningless, unless --help and --version are + locally used. Localization would be best accomplished by the calling tar, on messages found within error packets. */ program_name = argv[0]; @@ -193,25 +283,47 @@ main (int argc, char *const *argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - /* FIXME: Implement --help and --version as for any other GNU program. */ + switch (getopt_long (argc, argv, "", long_opts, NULL)) + { + default: + usage (EXIT_FAILURE); + + case 'h': + usage (EXIT_SUCCESS); + + case 'v': + { + 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\ +see the file named COPYING for details.")); + } + return EXIT_SUCCESS; + + case -1: + break; + } - argc--, argv++; - if (argc > 0) + if (optind < argc) { - debug_file = fopen (*argv, "w"); + if (optind != argc - 1) + usage (EXIT_FAILURE); + debug_file = fopen (argv[optind], "w"); if (debug_file == 0) { report_numbered_error (errno); exit (EXIT_FAILURE); } - setbuf (debug_file, NULL); + setbuf (debug_file, 0); } top: - errno = 0; /* FIXME: errno should be read-only */ + errno = 0; status = 0; - if (full_read (STDIN_FILENO, &command, 1) != 1) - exit (EXIT_SUCCESS); + if (safe_read (STDIN_FILENO, &command, 1) != 1) + return EXIT_SUCCESS; switch (command) { @@ -220,16 +332,16 @@ top: case 'O': { char device_string[STRING_SIZE]; - char mode_string[STRING_SIZE]; + char oflag_string[STRING_SIZE]; get_string (device_string); - get_string (mode_string); - DEBUG2 ("rmtd: O %s %s\n", device_string, mode_string); + get_string (oflag_string); + DEBUG2 ("rmtd: O %s %s\n", device_string, oflag_string); if (tape >= 0) close (tape); - tape = open (device_string, atoi (mode_string), 0666); + tape = open (device_string, decode_oflag (oflag_string), MODE_RW); if (tape < 0) goto ioerror; goto respond; @@ -327,11 +439,11 @@ 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 = full_read (STDIN_FILENO, &record_buffer[counter], - size - counter); + status = safe_read (STDIN_FILENO, &record_buffer[counter], + size - counter); if (status <= 0) { DEBUG (_("rmtd: Premature eof\n")); @@ -355,13 +467,13 @@ top: DEBUG1 ("rmtd: R %s\n", count_string); size = atol (count_string); - prepare_record_buffer (size); - status = full_read (tape, record_buffer, size); + prepare_input_buffer (-1, size); + status = safe_read (tape, record_buffer, size); if (status < 0) goto ioerror; - sprintf (reply_buffer, "A%ld\n", status); + sprintf (reply_buffer, "A%ld\n", (long) status); full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); - full_write (STDOUT_FILENO, record_buffer, (size_t) status); + full_write (STDOUT_FILENO, record_buffer, status); goto top; } @@ -434,10 +546,10 @@ top: if (ioctl (tape, MTIOCGET, (char *) &operation) < 0) goto ioerror; - status = sizeof (operation); - sprintf (reply_buffer, "A%ld\n", status); + status = sizeof operation; + sprintf (reply_buffer, "A%ld\n", (long) status); full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); - full_write (STDOUT_FILENO, (char *) &operation, sizeof (operation)); + full_write (STDOUT_FILENO, (char *) &operation, sizeof operation); } #endif goto top; @@ -451,9 +563,9 @@ top: } respond: - DEBUG1 ("rmtd: A %ld\n", status); + DEBUG1 ("rmtd: A %ld\n", (long) status); - sprintf (reply_buffer, "A%ld\n", status); + sprintf (reply_buffer, "A%ld\n", (long) status); full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); goto top;