X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Frmt.c;h=99607e7590c72a6ffbbd40654fc6d5203136116b;hb=db46e2e2b35d5c6f9358801c60abc3b1f68c6dc1;hp=ac0317d31bc1b01a93180a35b6d55f6cc121dece;hpb=00a2b4708fc77a09c9b5ca372b2846341c12c75e;p=chaz%2Ftar diff --git a/src/rmt.c b/src/rmt.c index ac0317d..99607e7 100644 --- a/src/rmt.c +++ b/src/rmt.c @@ -1,5 +1,5 @@ /* Remote connection server. - Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright 1994, 1995, 1996, 1997, 1999 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 @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., - 59 Place - Suite 330, Boston, MA 02111-1307, USA. */ + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Copyright (C) 1983 Regents of the University of California. All rights reserved. @@ -30,6 +30,7 @@ MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #include "system.h" +#include "safe-read.h" #include @@ -81,12 +82,12 @@ char *strerror (); static char * private_strerror (int errnum) { - extern const char *const sys_errlist[]; + extern char *sys_errlist[]; extern int sys_nerr; if (errnum > 0 && errnum <= sys_nerr) - return sys_errlist[errnum]; - return N_("Unknown system error"); + return _(sys_errlist[errnum]); + return _("Unknown system error"); } # define strerror private_strerror #endif @@ -101,7 +102,7 @@ report_error_message (const char *string) DEBUG1 ("rmtd: E 0 (%s)\n", string); sprintf (reply_buffer, "E0\n%s\n", string); - write (1, reply_buffer, strlen (reply_buffer)); + full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); } /*---. @@ -114,7 +115,7 @@ report_numbered_error (int num) DEBUG2 ("rmtd: E %d (%s)\n", num, strerror (num)); sprintf (reply_buffer, "E%d\n%s\n", num, strerror (num)); - write (1, reply_buffer, strlen (reply_buffer)); + full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); } /*---. @@ -128,7 +129,7 @@ get_string (char *string) for (counter = 0; counter < STRING_SIZE; counter++) { - if (read (0, string + counter, 1) != 1) + if (safe_read (STDIN_FILENO, string + counter, 1) != 1) exit (EXIT_SUCCESS); if (string[counter] == '\n') @@ -164,7 +165,9 @@ prepare_record_buffer (size_t size) #ifdef SO_RCVBUF while (size > 1024 && - setsockopt (0, SOL_SOCKET, SO_RCVBUF, (char *) &size, sizeof (size)) < 0) + (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! */ @@ -172,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 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 otherwise. + + 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; +} + /*---. | ? | `---*/ @@ -208,7 +288,7 @@ main (int argc, char *const *argv) top: errno = 0; /* FIXME: errno should be read-only */ status = 0; - if (read (0, &command, 1) != 1) + if (safe_read (STDIN_FILENO, &command, 1) != 1) exit (EXIT_SUCCESS); switch (command) @@ -218,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; @@ -252,6 +332,7 @@ top: char position_string[STRING_SIZE]; off_t count = 0; int negative; + int whence; char *p; get_string (count_string); @@ -286,7 +367,16 @@ top: } } - count = lseek (tape, count, atoi (position_string)); + switch (atoi (position_string)) + { + case 0: whence = SEEK_SET; break; + case 1: whence = SEEK_CUR; break; + case 2: whence = SEEK_END; break; + default: + report_error_message (N_("Seek direction out of range")); + exit (EXIT_FAILURE); + } + count = lseek (tape, count, whence); if (count < 0) goto ioerror; @@ -301,7 +391,7 @@ top: DEBUG1 ("rmtd: A %s\n", p); sprintf (reply_buffer, "A%s\n", p); - write (1, reply_buffer, strlen (reply_buffer)); + full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); goto top; } @@ -318,7 +408,8 @@ top: prepare_record_buffer (size); for (counter = 0; counter < size; counter += status) { - status = read (0, &record_buffer[counter], size - counter); + status = safe_read (STDIN_FILENO, &record_buffer[counter], + size - counter); if (status <= 0) { DEBUG (_("rmtd: Premature eof\n")); @@ -327,7 +418,7 @@ top: exit (EXIT_FAILURE); /* exit status used to be 2 */ } } - status = write (tape, record_buffer, size); + status = full_write (tape, record_buffer, size); if (status < 0) goto ioerror; goto respond; @@ -343,12 +434,12 @@ top: size = atol (count_string); prepare_record_buffer (size); - status = read (tape, record_buffer, size); + status = safe_read (tape, record_buffer, size); if (status < 0) goto ioerror; sprintf (reply_buffer, "A%ld\n", status); - write (1, reply_buffer, strlen (reply_buffer)); - write (1, record_buffer, (size_t) status); + full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); + full_write (STDOUT_FILENO, record_buffer, (size_t) status); goto top; } @@ -423,8 +514,8 @@ top: goto ioerror; status = sizeof (operation); sprintf (reply_buffer, "A%ld\n", status); - write (1, reply_buffer, strlen (reply_buffer)); - write (1, (char *) &operation, sizeof (operation)); + full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); + full_write (STDOUT_FILENO, (char *) &operation, sizeof (operation)); } #endif goto top; @@ -441,7 +532,7 @@ respond: DEBUG1 ("rmtd: A %ld\n", status); sprintf (reply_buffer, "A%ld\n", status); - write (1, reply_buffer, strlen (reply_buffer)); + full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); goto top; ioerror: