X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=a7d89712fc0d931dddd948403f95249a1c7f0c6e;hb=576e99a21c566598d7a701142e439cb283cac24f;hp=95e8a26de1e42a5b2b922300c57dbd3e22db25f0;hpb=45ccda119355a1087450039a250359c1d0de0d08;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index 95e8a26..a7d8971 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -668,6 +668,22 @@ init_buffer (void) record_end = record_start + blocking_factor; } +static void +check_tty (enum access_mode mode) +{ + /* Refuse to read archive from and write it to a tty. */ + if (strcmp (archive_name_array[0], "-") == 0 + && isatty (mode == ACCESS_READ ? STDIN_FILENO : STDOUT_FILENO)) + { + FATAL_ERROR ((0, 0, + mode == ACCESS_READ + ? _("Refusing to read archive contents from terminal " + "(missing -f option?)") + : _("Refusing to write archive contents to terminal " + "(missing -f option?)"))); + } +} + /* Open an archive file. The argument specifies whether we are reading or writing, or both. */ static void @@ -688,6 +704,7 @@ _open_archive (enum access_mode wanted_access) /* When updating the archive, we start with reading. */ access_mode = wanted_access == ACCESS_UPDATE ? ACCESS_READ : wanted_access; + check_tty (access_mode); read_full_records = read_full_records_option; @@ -731,7 +748,6 @@ _open_archive (enum access_mode wanted_access) enum compress_type type; archive = STDIN_FILENO; - type = check_compressed_archive (&shortfile); if (type != ct_tar && type != ct_none) FATAL_ERROR ((0, 0,