X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Frmt.c;h=8e9ad8433a8da83d333b17559a65110ae7ab4ded;hb=f87e585c511d94bbf6413665e1d662902802cad7;hp=f5e036cd6ceddae21e80b1b58aa126b6c6ad3633;hpb=d46735235be2b3bcaf2e580d86f321130cd78e94;p=chaz%2Ftar diff --git a/src/rmt.c b/src/rmt.c index f5e036c..8e9ad84 100644 --- a/src/rmt.c +++ b/src/rmt.c @@ -27,9 +27,10 @@ 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 "safe-read.h" #include @@ -50,15 +51,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) @@ -152,7 +153,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")); @@ -174,6 +175,83 @@ prepare_record_buffer (size_t size) #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[] = + { + {"APPEND", O_APPEND}, + {"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; +} + /*---. | ? | `---*/ @@ -182,10 +260,10 @@ 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]; @@ -204,7 +282,7 @@ main (int argc, char *const *argv) report_numbered_error (errno); exit (EXIT_FAILURE); } - setbuf (debug_file, NULL); + setbuf (debug_file, 0); } top: @@ -220,16 +298,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; @@ -359,9 +437,9 @@ top: 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 +512,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 +529,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;