Fixed a crash when using the --terminal option without having access to the given terminal

3 files changed, 9 insertions, 1 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a23b5396..b473c9e9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -546,6 +546,8 @@ Steffen Barszus <st_barszus@gmx.de>
  for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device
  for making the program use the values of VIDEODIR and PLUGINDIR defined in Makefile
  or Makefile.config as defaults
+ for helping to debug a crash when using the --terminal option without having access
+ to the given terminal
 
 Peter Seyringer <e9425234@student.tuwien.ac.at>
  for reporting a bug in saving the polarization parameter of channels that have a
diff --git a/HISTORY b/HISTORY
index b6f387ab..9f741ecb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2358,3 +2358,5 @@ Video Disk Recorder Revision History
 - Updated VIVA, VIVA Plus, MTV Central and MTV 2 in channels.conf (thanks to
   Sebastian Frei).
 - Changed "Studio Universal" to "Sci-Fi" in channels.conf.
+- Fixed a crash when using the --terminal option without having access to the
+  given terminal (thanks to Steffen Barszus for helping to debug this one).
diff --git a/vdr.c b/vdr.c
index 9c54e3a4..051e3d85 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.166 2003/08/24 11:18:04 kls Exp $
+ * $Id: vdr.c 1.167 2003/09/05 13:01:00 kls Exp $
  */
 
 #include <getopt.h>
@@ -199,6 +199,10 @@ int main(int argc, char *argv[])
           case 's': Shutdown = optarg;
                     break;
           case 't': Terminal = optarg;
+                    if (access(Terminal, R_OK | W_OK) < 0) {
+                       fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
+                       return 2;
+                       }
                     break;
           case 'V': DisplayVersion = true;
                     break;