X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Frmt.c;h=770b9e24e07e281b5cf10a192e766b56d982418d;hb=e873bb4ed86124a0a425cc825b4ad15754f86069;hp=0215bffb8a577855380ecb7068866bd9eaf80780;hpb=02519e55752f86d85a03643332a0bdd0850c265c;p=chaz%2Ftar diff --git a/src/rmt.c b/src/rmt.c index 0215bff..770b9e2 100644 --- a/src/rmt.c +++ b/src/rmt.c @@ -1,5 +1,5 @@ /* Remote connection server. - Copyright 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. + Copyright 1994,95,96,97,99,2000, 2001 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 @@ -30,7 +30,9 @@ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #include "system.h" -#include "safe-read.h" +#include +#include +#include #include #include @@ -71,10 +73,7 @@ static FILE *debug_file; #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 (); @@ -93,10 +92,6 @@ private_strerror (int errnum) # define strerror private_strerror #endif -/*---. -| ? | -`---*/ - static void report_error_message (const char *string) { @@ -106,10 +101,6 @@ report_error_message (const char *string) full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); } -/*---. -| ? | -`---*/ - static void report_numbered_error (int num) { @@ -119,10 +110,6 @@ report_numbered_error (int num) full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer)); } -/*---. -| ? | -`---*/ - static void get_string (char *string) { @@ -139,10 +126,6 @@ get_string (char *string) string[counter] = '\0'; } -/*---. -| ? | -`---*/ - static void prepare_record_buffer (size_t size) { @@ -204,7 +187,9 @@ decode_oflag (char const *oflag_string) 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}, @@ -281,10 +266,6 @@ Manipulate a tape drive, accepting commands from a remote process.\n\ exit (status); } -/*---. -| ? | -`---*/ - int main (int argc, char *const *argv) { @@ -310,7 +291,7 @@ main (int argc, char *const *argv) case 'v': printf ("rmt (GNU %s) %s\n%s\n%s\n", PACKAGE, VERSION, - "Copyright 1999 Free Software Foundation, Inc.", + "Copyright 2001 Free Software Foundation, Inc.", _("\ 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\ @@ -335,7 +316,7 @@ see the file named COPYING for details.")); } top: - errno = 0; /* FIXME: errno should be read-only */ + errno = 0; status = 0; if (safe_read (STDIN_FILENO, &command, 1) != 1) return EXIT_SUCCESS;