Added command line option -V

3 files changed, 15 insertions, 7 deletions

diff --git a/HISTORY b/HISTORY
index ed680c45..9415959c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1138,3 +1138,4 @@ Video Disk Recorder Revision History
 - Fixed scrolling the "Channels" menu in case the cursor ends up on a group
   delimiter (thanks to Bernd Zierath for helping to debug this one).
 - Added a manual page vdr(1).
+- New command command line option '-V' to display the VDR version.
diff --git a/vdr.1 b/vdr.1
index 50342249..1fd39df6 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,13 +8,12 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.1 2002/03/24 14:10:00 kls Exp $
+.\" $Id: vdr.1 1.2 2002/03/29 10:10:04 kls Exp $
 .\"
-.TH vdr 1 "24 Mar 2002" "1.0.0" "Video Disk Recorder"
+.TH vdr 1 "29 Mar 2002" "1.0.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
-.\" The general command line
 .B vdr
 [options]
 .SH DESCRIPTION
@@ -91,6 +90,9 @@ Set the controlling terminal.
 Use \fIdir\fR as video directory.
 The default is \fI/video\fR.
 .TP
+.B -V, --version
+Print version information and exit.
+.TP
 .BI -w\  sec ,\ --watchdog= sec
 Activate the watchdog timer with a timeout of \fIsec\fR seconds.
 A value of \fB0\fR (default) disables the watchdog.
@@ -152,7 +154,7 @@ also be read at program startup to have the full EPG data available immediately.
 .BR vdr (5)
 .SH AUTHOR
 Written by Klaus Schmidinger, with contributions from many others.
-See the file \fICONTRIBUTORS\fR in the source distribution.
+See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
 Report bugs to <vdr-bugs@cadsoft.de>.
 .SH COPYRIGHT
diff --git a/vdr.c b/vdr.c
index 17ae1488..874e8264 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.101 2002/03/09 17:10:16 kls Exp $
+ * $Id: vdr.c 1.102 2002/03/29 10:09:20 kls Exp $
  */
 
 #include <getopt.h>
@@ -101,6 +101,7 @@ int main(int argc, char *argv[])
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
+      { "version",  no_argument,       NULL, 'V' },
       { "video",    required_argument, NULL, 'v' },
       { "watchdog", required_argument, NULL, 'w' },
       { NULL }
@@ -108,7 +109,7 @@ int main(int argc, char *argv[])
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:mp:r:s:t:v:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:mp:r:s:t:v:Vw:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -139,7 +140,7 @@ int main(int argc, char *argv[])
                            "                           %s); use '-E-' to disable this\n"
                            "                           if FILE is a directory, the default EPG file will be\n"
                            "                           created in that directory\n"
-                           "  -h,       --help         display this help and exit\n"
+                           "  -h,       --help         print this help and exit\n"
                            "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                            "                           0 = no logging, 1 = errors only,\n"
                            "                           2 = errors and info, 3 = errors, info and debug\n"
@@ -149,6 +150,7 @@ int main(int argc, char *argv[])
                            "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                            "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                            "  -t TTY,   --terminal=TTY controlling tty\n"
+                           "  -V,       --version      print version information and exit\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                            "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                            "                           seconds (default: %d); '0' disables the watchdog\n"
@@ -186,6 +188,9 @@ int main(int argc, char *argv[])
                     break;
           case 't': Terminal = optarg;
                     break;
+          case 'V': printf("vdr, version %s\n", VDRVERSION);
+                    return 0;
+                    break;
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;