From 129be0acc85b2bb7bb9b3c71b0c4caa350aecb4b Mon Sep 17 00:00:00 2001 From: fche Date: Wed, 6 Dec 2006 17:13:47 +0000 Subject: 2006-12-05 Frank Ch. Eigler PR 3648 * main.cxx (main): Tweak error message for tapset script execution. Also catch those clever rogues who use stdin. --- main.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'main.cxx') diff --git a/main.cxx b/main.cxx index 00d64c71..d91f3df9 100644 --- a/main.cxx +++ b/main.cxx @@ -454,7 +454,10 @@ main (int argc, char * const argv []) int user_file_stat_rc = -1; if (script_file == "-") - s.user_file = parser::parse (s, cin, s.guru_mode); + { + s.user_file = parser::parse (s, cin, s.guru_mode); + user_file_stat_rc = fstat (STDIN_FILENO, & user_file_stat); + } else if (script_file != "") { s.user_file = parser::parse (s, script_file, s.guru_mode); @@ -529,8 +532,8 @@ main (int argc, char * const argv []) user_file_stat.st_dev == tapset_file_stat.st_dev && user_file_stat.st_ino == tapset_file_stat.st_ino) { - clog << "parse error: tapset file '" << globbuf.gl_pathv[j] - << "' is already processed as the user script." << endl; + clog << "usage error: tapset file '" << globbuf.gl_pathv[j] + << "' cannot be run directly as a session script." << endl; rc ++; } -- cgit