Fixed some whitespace errors

* Trailing whitespaces removed
* All but one trailing newline on end of files removed
* Fixed some line lengths in text files

8 files changed, 112 insertions, 116 deletions

diff --git a/COPYING b/COPYING
index 5b6e7c6..dcfa4c2 100644
--- a/COPYING
+++ b/COPYING
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
diff --git a/HISTORY b/HISTORY
index 5d1f4e6..e7e56a5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,7 +4,8 @@ runvdr extreme Revision History
 2009-06-28: Version 0.4.2
 - New: Support -i and --instance of VDR-1.7.4+
 - New: Command line option to set VDR_CHARSET_OVERRIDE of VDR 1.5.18+
-- New: Function-style callbacks for DVB load/unload commands (backwards compatible)
+- New: Function-style callbacks for DVB load/unload commands (backwards
+  compatible)
 - New: Option to always unload DVB drivers on exit
 - New: Callbacks for X-Server startup and shutdown to run additional programs
 - Fix: --lirc not working. Thx to caps!
@@ -17,7 +18,8 @@ runvdr extreme Revision History
 
 2008-09-14: Version 0.4.0
 - New: Start own X server for VDR to run in
-- New: Experimental support to read sysconfig file from setup-plugin, thx to dad401
+- New: Experimental support to read sysconfig file from setup-plugin,
+  thx to dad401
 - New: Parameters to control automatic restart behavior
 - Fix: Made the init.d script LSB compliant, thx to Antonio for the hint.
 - Fix: Online help for runvdr-conf.d
@@ -25,7 +27,7 @@ runvdr extreme Revision History
 2008-03-02: Version 0.3.0
 - New: Support for the new VDR parameters --localedir and --userdump
   (LOCALEDIR="..." and USERDUMP="1")
-- New: Wildcard loading with INCLUDE, allows for example to INCLUDE 
+- New: Wildcard loading with INCLUDE, allows for example to INCLUDE
   /etc/runvdr/conf.d/* to load several one-file-per-plugin config files.
 - New: runvdr-conf.d, a plugin enable/disable service
 - New: osdserver frontend for runvdr-conf.d
@@ -35,10 +37,10 @@ runvdr extreme Revision History
 
 2007-02-18: Version 0.2.0
 
-- New: Pass DVBLOAD and DVBUNLOAD to eval, allows to execute more than one 
+- New: Pass DVBLOAD and DVBUNLOAD to eval, allows to execute more than one
   command, thanks to Thomas Büschgens
 - New: Load ~/.runvdr.conf as default, load /etc/runvdr.conf as fallback
-- New: INCLUDE directive to load other config file  
+- New: INCLUDE directive to load other config file
 - New: -P "-plugin" drops plugin from plugin load list. Same for -D.
 - Change: LANGUAGE now sets LC_ALL, not LANG.
 
@@ -51,4 +53,3 @@ runvdr extreme Revision History
 2006-10-08: Version 0.1
 
 - Initial revision.
-
diff --git a/README b/README
index 6f12403..1525be4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-        
+
                        runvdr extreme
 
 
@@ -47,11 +47,11 @@ Additional features of runvdr-conf.d:
 Quick-start
 --------------------------------------------------------------------------
 - Copy runvdr to /usr/local/bin/ or whereever you like
-- Copy runvdr.conf.example to /etc/runvdr.conf if you want to run VDR as 
+- Copy runvdr.conf.example to /etc/runvdr.conf if you want to run VDR as
   server, or ~/.runvdr.conf if you want to run it as user.
 - Edit the runvdr.conf to match your needs
 
-The runvdr.conf is pretty much self-explaining. All runvdr.conf options are 
+The runvdr.conf is pretty much self-explaining. All runvdr.conf options are
 also available on command line, see --help.
 
 For the init-script (Debian):
@@ -85,20 +85,20 @@ load /etc/runvdr.conf from within ~/.runvdr.conf to just override some of
 the settings for the current user.
 
 The INCLUDE directive also supports multiple files per line. By that, you can
-use INCLUDE /etc/runvdr/conf.d/* to load a whole directory full of config 
-files at once. For example, you can put files (or symlinks) for each plugin 
+use INCLUDE /etc/runvdr/conf.d/* to load a whole directory full of config
+files at once. For example, you can put files (or symlinks) for each plugin
 to load into that directory, containing a single line "AddPlugin xxx".
 
 Plugins added by the AddPlugin directive in the conf file and the --plugin
-and -P command line option can be removed again from the list of plugins 
-by specifying "AddPlugin -name", --plugin="-name" or -P-name. 
-The name part acts as a pattern to the beginning of the plugin name, all 
+and -P command line option can be removed again from the list of plugins
+by specifying "AddPlugin -name", --plugin="-name" or -P-name.
+The name part acts as a pattern to the beginning of the plugin name, all
 plugins matching "name*" will be dropped. Especially "AddPlugin -" and -P- will
 drop all plugins from the list. The same mechanism works for the -D device
 parameter.
 
 To pass parameters to VDR without parsing by runvdr, use -- as paramenter.
-All parameters after -- will be directly passed to VDR. For erxample, 
+All parameters after -- will be directly passed to VDR. For erxample,
 "runvdr -- --help" will show the command line help of VDR instead of runvdr.
 
 
@@ -113,14 +113,14 @@ in alphabetical order.
 In case of runvdr-conf.d, one file similar to the skeleton.example file
 is placed in /etc/runvdr/ for each plugin that is available. Only plugins
 that have a symbolic link in /etc/runvdr/conf.d/ to their config file will
-be loaded. For this, the corresponding INCLUDE line must be enabled in 
+be loaded. For this, the corresponding INCLUDE line must be enabled in
 runvdr.conf.
 
 The following commands are available to manage the plugins:
 
 runvdr-conf.d show [name]
   Shows all plugins (resp. only the 'name' plugin), including the full name
-  and the load priority. 'name' is the file name in the /etc/runvdr/ 
+  and the load priority. 'name' is the file name in the /etc/runvdr/
   directory.
 
 runvdr-conf.d enable name [--prio XX]
@@ -134,10 +134,10 @@ runvdr-conf.d disable name
 
 runvdr-conf.d osdserver [--debug]
   Connects to the osdserver plugin and allows interactive plugin configuration
-  using the VDR OSD. From there, plugins can be activated and deactivated, 
+  using the VDR OSD. From there, plugins can be activated and deactivated,
   and the load priority can be changed.
-  Without --debug, runvdr-conf.d returns immediately, disconnection standard 
-  input/output, so it can be started from commands.conf. With --debug, the 
+  Without --debug, runvdr-conf.d returns immediately, disconnection standard
+  input/output, so it can be started from commands.conf. With --debug, the
   osdserver communication will be shown.
 
 
@@ -208,12 +208,11 @@ Load all plugins, but not the hello-plugin:
 Do a dry-run of runvdr:
 
   runvdr --wrapper=echo
-  
+
 Do a debugging session:
 
   runvdr --wrapper="gdb --args"
-  
+
 Start with a completely different setup:
 
   runvdr --runvdr-conf="/etc/runvdr-debugging.conf"
-
diff --git a/README.de b/README.de
index ff75e4b..b08be65 100644
--- a/README.de
+++ b/README.de
@@ -1,4 +1,4 @@
-        
+
                        runvdr extreme
 
 
@@ -26,7 +26,7 @@ Einige der Features von runvdr extreme:
 - Vermeidet endlose Schleifen, wenn VDR sofort stirbt
 - Setzt Terminal zurück nachdem VDR beendet wurde
 - Starten von Wrapper-Programmen zum Debuggen
-- Wartet bis der VDR-Prozess beendet wurde, 
+- Wartet bis der VDR-Prozess beendet wurde,
   hartes Beenden nach Timeout
 - Kommandozeilenhilfe
 - Kann Konsole umschalten
@@ -36,7 +36,7 @@ Einige der Features von runvdr extreme:
 
 Dazu kommt runvdr-conf.d:
 
-- Lädt Konfigurationsdateien alphabetisch aus einem Verzeichnis, 
+- Lädt Konfigurationsdateien alphabetisch aus einem Verzeichnis,
   vergleichbar mit init.d-Verzeichnissen.
 - Kommandozeilentool zum Aktivieren/Deaktivieren von Plugins
 - Festlegen der Ladereihenfolge
@@ -47,7 +47,7 @@ Dazu kommt runvdr-conf.d:
 Schnellstart
 --------------------------------------------------------------------------
 - Kopiere runvdr nach /usr/local/bin/ oder wo-auch-immer-du-magst
-- Kopiere runvdr.conf.example nach /etc/runvdr.conf, wenn runvdr als 
+- Kopiere runvdr.conf.example nach /etc/runvdr.conf, wenn runvdr als
   Server laufen soll, oder nach ~/.runvdr.conf, wenn runvdr durch
   einen Benutzer gestartet werden soll.
 - Bearbeite /etc/runvdr.conf nach deinem Bedarf
@@ -77,20 +77,20 @@ Die Optionen werden in dieser Reihenfolge ausgewertet:
 1. Kommandozeilenoptionen haben höchste Priorität.
 2. runvdr.conf auf Kommandozeile mit -C oder --runvdr-conf angegeben
 3. Wenn kein -C und kein --runvdr-conf angegeben, benutze ~/.runvdr.conf
-4. Wenn kein -C und kein --runvdr-conf und kein ~/.runvdr.conf, benutze 
+4. Wenn kein -C und kein --runvdr-conf und kein ~/.runvdr.conf, benutze
    /etc/runvdr.conf
 5. Wenn keine der obigen Dateien existiert, benutze runvdr-Defaults
 
 Nur eine runvdr.conf wird normalerweise geladen, und nur eine -C Option
 wird ausgewertet. Man kann aber den Inhalt einer runvdr.conf in einer anderen
-runvdr.conf laden, wenn man die INCLUDE-Direktive verwendet. Man kann zum 
-Beispiel /etc/runvdr.conf aus der Datei ~/.runvdr.conf heraus laden, um 
+runvdr.conf laden, wenn man die INCLUDE-Direktive verwendet. Man kann zum
+Beispiel /etc/runvdr.conf aus der Datei ~/.runvdr.conf heraus laden, um
 für den aktuellen Benutzer einige Einstellungen zu überschreiben.
 
 Die INCLUDE-Direktive kann auch mehrere Konfigurationsdateien laden. So kann
 man z.B. mit INCLUDE /etc/runvdr/conf.d/* ein ganzes Verzeichnis von
 Konfigurationsdateien laden. Beispielsweise könnten in so einem Verzeichnis
-für jedes zu ladende Plugin eine Datei (oder Symlink) mit dem Einzeiler 
+für jedes zu ladende Plugin eine Datei (oder Symlink) mit dem Einzeiler
 "AddPlugin xxx" liegen.
 
 Plugins, die durch die AddPlugin-Direktive in der conf-Datei oder die
@@ -98,12 +98,12 @@ Plugins, die durch die AddPlugin-Direktive in der conf-Datei oder die
 entfernt werden, wenn man "AddPlugin -name", --plugin="-name" oder -P-name
 verwendet. Der name-Teil wird dabei als Muster für den Anfangsteil des Plugin-
 Namens verwendet, alle Plugins, die auf "name*" passen, werden entfernt.
-Insbesondere hebt "AddPlugin -" und -P- die gesamte bisherige Plugin-Liste 
+Insbesondere hebt "AddPlugin -" und -P- die gesamte bisherige Plugin-Liste
 auf. Der selbe Mechanismus funktioniert auch beim -D Device-Parameter.
 
-Um Parameter an VDR direkt weiter zu geben, ohne dass runvdr sie 
-interpretiert, kann -- als Parameter angegeben werden. Alle Parameter nach 
--- werden unverändert an VDR weiter gegeben. So gibt "runvdr -- --help" 
+Um Parameter an VDR direkt weiter zu geben, ohne dass runvdr sie
+interpretiert, kann -- als Parameter angegeben werden. Alle Parameter nach
+-- werden unverändert an VDR weiter gegeben. So gibt "runvdr -- --help"
 die Hilfestellung von VDR aus, und nicht die Hilfestellung von runvdr.
 
 
@@ -111,7 +111,7 @@ die Hilfestellung von VDR aus, und nicht die Hilfestellung von runvdr.
 runvdr-conf.d
 --------------------------------------------------------------------------
 
-Mit runvdr-conf.d steht ein (optionales) Tool zur Verfügung, das das 
+Mit runvdr-conf.d steht ein (optionales) Tool zur Verfügung, das das
 Verwalten der Plugins erleichtern soll. Es funktioniert nach dem init.d
 Prinzip, bei dem in einem Verzeichnis mehrere symbolische Links auf Dateien
 abgelegt werden, die in alphabetischer Reihenfolge abgearbeitet werden.
@@ -119,13 +119,13 @@ abgelegt werden, die in alphabetischer Reihenfolge abgearbeitet werden.
 Im Falle von runvdr-conf.d legt man pro zu ladendem Plugin eine eigene
 Konfigurationsdatei nach Vorbild der skeleton.example in /etc/runvdr/ ab.
 Geladen werden Plugins, deren symbolischer Link unter /etc/runvdr/conf.d
-liegt. Dazu muss in der runvdr.conf die passende INCLUDE-Zeile aktiviert 
+liegt. Dazu muss in der runvdr.conf die passende INCLUDE-Zeile aktiviert
 werden.
 
 Folgende Befehle stehen zur Verfügung, um die aktiven Plugins zu verwalten:
 
 runvdr-conf.d show [name]
-  Zeigt alle Plugins bzw. ein Plugin an, inklusive Name und Ladepriorität. 
+  Zeigt alle Plugins bzw. ein Plugin an, inklusive Name und Ladepriorität.
   'name' ist der Dateiname im Verzeichnis /etc/runvdr/.
 
 runvdr-conf.d enable name [--prio XX]
@@ -141,7 +141,7 @@ runvdr-conf.d osdserver [--debug]
   Verbindet mit OSD-Server Plugin und erlaubt das Konfigurieren der Plugins
   per VDR OSD. Von dort können Plugins aktiviert und deaktivert werden, und
   die Ladepriorität gesetzt werden.
-  Ohne --debug kehrt runvdr-conf.d sofort zurück und trennt sich von der 
+  Ohne --debug kehrt runvdr-conf.d sofort zurück und trennt sich von der
   Standard-Ein/Ausgabe, kann also von der commands.conf direkt aufgerufen
   werden. Mit --debug wird die OSD-Server Kommunikation ausgegeben.
 
@@ -213,12 +213,11 @@ Lade alle Plugins, aber nicht das hello-Plugin:
 Starte einen Testlauf von runvdr, um zu sehen was passiert:
 
   runvdr --wrapper=echo
-  
+
 Starte eine Debugging-Session:
 
   runvdr --wrapper="gdb --args"
-  
+
 Starte mit einer komplett abweichenden Konfiguration:
 
   runvdr --runvdr-conf="/etc/runvdr-debugging.conf"
-
diff --git a/init.d.runvdr.Debian b/init.d.runvdr.Debian
index bc3d1f1..5744e41 100755
--- a/init.d.runvdr.Debian
+++ b/init.d.runvdr.Debian
@@ -33,7 +33,7 @@ test -x $DAEMON || exit 0
 #
 d_start() {
     start-stop-daemon --start --background --quiet --pidfile $PIDFILE \
-        --exec $DAEMON -- 
+        --exec $DAEMON --
 }
 
 #
diff --git a/runvdr b/runvdr
index ba6520b..8e9f548 100755
--- a/runvdr
+++ b/runvdr
@@ -314,7 +314,7 @@ function AddParams() {
     for i ; do
     	ADDPARAMS[${#ADDPARAMS[*]}]="$i"
     done
-}        
+}
 
 function INCLUDE() {
     # include different conf file(s)
@@ -363,7 +363,7 @@ function LoadConfFile() {
     [ -z "$DVBRESTART" ] && DVBRESTART=0
     [ -z "$MAXRESTARTS" ] && MAXRESTARTS=5
     [ -z "$RESTARTTIME" ] && RESTARTTIME=10
-    
+
     # Compatibility: Map old ADDPARAM to new AddParams
     [ -n "$ADDPARAM" ] && eval "AddParams $ADDPARAM"
 
@@ -857,14 +857,14 @@ while (true) do
         # Run X server that runs VDR
         PROXYFILE="/tmp/runvdr-$$"
         [ -f "$PROXYFILE" ] && rm "$PROXYFILE"
-        
+
         # Pack command array into single env string:
         export VDRCOMMANDPROXY=`printf '%q ' "${VDRCOMMAND[@]}"`
         export XSTARTUP
         export XSHUTDOWN
         [ "`type -t XSTARTUP`" = "function" ] && export -f XSTARTUP
         [ "`type -t XSHUTDOWN`" = "function" ] && export -f XSHUTDOWN
-        
+
         # Fire up X server that calls back runvdr, and run into XSERVERPROXY there
         eval "xinit \""$0"\" --xserver-proxy=\""$PROXYFILE"\" -- $XSERVER &"
 
@@ -1010,5 +1010,3 @@ done
 
 # Clean up proxy file, if used
 [ -n "$PROXYFILE" ] && rm $PROXYFILE >&- 2>&-
-
-
diff --git a/runvdr-conf.d b/runvdr-conf.d
index eebe97a..ca97d7f 100755
--- a/runvdr-conf.d
+++ b/runvdr-conf.d
@@ -32,17 +32,17 @@ function ConnectServer() {
     exec 3<> /tmp/pipe-in$$
     exec 4<> /tmp/pipe-out$$
     rm /tmp/pipe-in$$ /tmp/pipe-out$$
-    
+
     # Connect to server using the fifo
-    { 
+    {
         netcat $1 $2
-        
+
         # In case of connection loss:
         echo 499 disconnected
         echo 202 Good Bye.
     } <&3 >&4 &
     pid=$!
-    
+
     # Sending to the server: use >&3
     # Receive from the server: use <&4
 }
@@ -60,7 +60,7 @@ function ReadReply() {
     while read -r code line <&4 ; do
         if [ "$OSDSERVER_DEBUG" ] ; then echo "< $code $line" ; fi
         # screen echo
-        
+
         case $code in
             2*)     IFS=$' \t\n\r' reply2xx=($code "$line")
                     ;;
@@ -106,19 +106,19 @@ function IsEvent() {
 function QuoteString() {
     # Quote arbitrary string for use in '' and ""
     local str="${!1}"
-    
+
     str="${str//'\'/\\\\}"
     str="${str//'\\'/\\\\}"
     # work around bash bug: double quoted '\'
-    
+
     str="${str//\'/$'\\\''}"
     # This is bogus, anyone knows something better to replace ' by \' ?
-    
+
     str="${str//\"/\\\"}"
     str="${str//$'\r'/\\r}"
     str="${str//$'\n'/\\n}"
     str="${str//$'\t'/\\t}"
-    
+
     eval "$1=\$str"
 }
 
@@ -145,7 +145,7 @@ function GetConfInfo() {
     defaultprio=50
     loaded=""
     local tmp
-    
+
     if [ ! -f "$ALLSCRIPTS/$1" ] ; then
         return 1
     fi
@@ -168,14 +168,14 @@ function GetConfInfo() {
     if [ -z "$name" ] ; then
         return 1
     fi
-    
+
     tmp=("$ACTIVESCRIPTS"/[0-9][0-9]"$1")
     tmp="${tmp[0]}"
     if [ -f "$tmp" ] ; then
         tmp="${tmp:${#ACTIVESCRIPTS}+1}"
         loaded="${tmp:0:2}"
     fi
-    
+
     return 0
 }
 
@@ -203,10 +203,10 @@ function GetAllConfInfo() {
 
 function Command_Show() {
     GetAllConfInfo "$1"
-    
+
     local i;
     for ((i=0;i<confs;i++)) ; do
-        if [ $i -ne 0 ] ; then 
+        if [ $i -ne 0 ] ; then
             echo
         fi
         echo "Plugin short name: ${confs_short[i]}"
@@ -227,7 +227,7 @@ function Command_Enable() {
     if [ -z "$newloaded" ] ; then
         newloaded="$defaultprio"
     fi
-    
+
     if [ "$2" == "--prio" ] ; then
         newloaded="$3"
         while [ "${newloaded# }" != "$newloaded" ] ; do newloaded="${newloaded# }" ; done
@@ -275,28 +275,28 @@ function Osdserver_edit() {
         enable="No"
         loaded="$defaultprio"
     fi
-    
+
     SendCmd "enterlocal" || return $false
     # Preserve global variable space, so we can re-use 'menu'
-    
+
     SendCmd "menu=New Menu 'Edit $name'" || return $false
     SendCmd "menu.SetColumns 15" || return $false
     SendCmd "menu.EnableEvent keyOk close" || return $false
-    
+
     SendCmd "menu.AddNew OsdItem -unselectable 'Short name:\\t$short'" || return $false
-    
+
     SendCmd "menu.AddNew OsdItem -unselectable 'Long name:\\t$name'" || return $false
-    
+
     SendCmd "menu.AddNew OsdItem -unselectable 'Default priority:\\t$defaultprio'" || return $false
-    
+
     SendCmd "enable=menu.AddNew EditListItem Enabled No Yes -SelectName '$enable'" || return $false
     SendCmd "enable.SetCurrent" || return $false
-    
+
     SendCmd "prio=menu.AddNew EditIntItem -min 0 -max 99 'Current priority:' '$loaded'" || return $false
-    
+
     SendCmd "_focus.addsubmenu menu" || return $false
     SendCmd "menu.show" || return $false
-    
+
     while true; do
         SendCmd "menu.SleepEvent" || return $false
 
@@ -304,11 +304,11 @@ function Osdserver_edit() {
             SendCmd "enable.GetValue -name" || return $false
             [ "${reply6xx[0]}" != 600 ] && return $false
             enable="${reply6xx[1]}"
-            
+
             SendCmd "prio.GetValue" || return $false
             [ "${reply6xx[0]}" != 600 ] && return $false
             prio="${reply6xx[1]}"
-            
+
             if [ "$enable" == "Yes" ] ; then
                 Command_Enable "$short" --prio "$prio"
                 confs_loaded[$1]="$prio"
@@ -316,26 +316,26 @@ function Osdserver_edit() {
                 Command_Disable "$short"
                 confs_loaded[$1]=""
             fi
-            
+
             SendCmd "menu.SendState osBack" || return $false
-            SendCmd "delete menu" || return $false    
-            SendCmd "leavelocal" || return $false    
-            
+            SendCmd "delete menu" || return $false
+            SendCmd "leavelocal" || return $false
+
             return $true
         fi
         if IsEvent menu close ; then
-            SendCmd "delete menu" || return $false    
-            SendCmd "leavelocal" || return $false    
+            SendCmd "delete menu" || return $false
+            SendCmd "leavelocal" || return $false
             return $true
         fi
-    done   
+    done
 }
 
 function Osdserver_main() {
     SendCmd "menu=New Menu 'Runvdr config'" || return $false
     SendCmd "menu.SetColumns 5" || return $false
     SendCmd "menu.EnableEvent close" || return $false
-    
+
     local i;
     local min=0
     local prio
@@ -344,7 +344,7 @@ function Osdserver_main() {
         for ((i=0;i<confs;i++)) ; do
             prio="${confs_defaultprio[i]}"
             if [ -n "${confs_loaded[i]}" ] ; then prio=${confs_loaded[i]} ; fi
-            
+
             if [ "$prio" -eq "$min" ] ; then
                 SendCmd "conf$i=menu.AddNew OsdItem '${confs_loaded[i]:---}\t${confs_name[i]}'" || return $false
                 SendCmd "conf$i.EnableEvent keyOk" || return $false
@@ -355,16 +355,16 @@ function Osdserver_main() {
         done
         min="$nextmin"
     done
-    
+
     SendCmd "menu.Show" || return $false
-    
+
     while true ; do
         SendCmd "menu.SleepEvent" || return $false
-        
-        if IsEvent menu close ; then    
+
+        if IsEvent menu close ; then
             return $true
         fi
-        
+
         if [ "${reply3xx[1]:0:4}" == "conf" -a "${reply3xx[2]}" == "keyOk" ] ; then
             i="${reply3xx[1]:4}"
             Osdserver_edit "$i" || return $false
@@ -376,22 +376,22 @@ function Osdserver_main() {
 
 function Osdserver_connect() {
     GetAllConfInfo
-    
+
     ConnectServer localhost 2010
     # Connect to the server process
-    
+
     ReadReply || error
     # Read server welcome
-    
+
     SendCmd "Version 0.1" || error
     # Identify to server with protocol version
-    
+
     Osdserver_main || error
     # Main menu
-    
+
     SendCmd Quit
     # ... and good bye
-    
+
     exec 3>&-
     exec 4>&-
     # close FIFOs
@@ -433,6 +433,5 @@ runvdr-conf.d help
     This help
 ENDOFTEXT
 else
-    
     echo "Unknown command: $1" >&2
 fi
diff --git a/runvdr.conf.example b/runvdr.conf.example
index fdf8e6c..03aa6b6 100644
--- a/runvdr.conf.example
+++ b/runvdr.conf.example
@@ -51,7 +51,7 @@ CONFIGDIR="/video"
 
 # Location of locale files for VDR 1.5.14 and newer. Default is to use
 # the builtin "./locale" or whatever was compiled as LOCDIR into VDR.
-# 
+#
 # LOCALEDIR="/usr/src/vdr/locale"
 
 ##### -----------
@@ -66,7 +66,7 @@ CONFIGDIR="/video"
 #
 #   AddPlugin hello -b -a "A B C"
 #
-# which would load a plugin named "hello", giving it the three 
+# which would load a plugin named "hello", giving it the three
 # command line options "-b", "-a" and "A B C"
 #
 # Note: Using the command line option --plugin and -P requires additional
@@ -75,7 +75,7 @@ CONFIGDIR="/video"
 #   runvdr --plugin "hello -b -a \"A B C\""
 #
 # Add as many plugins as you want here:
-AddPlugin 
+AddPlugin
 AddPlugin
 AddPlugin
 AddPlugin
@@ -94,14 +94,14 @@ LIBDIR=""
 #####   More config options
 ##### -----------------------
 
-# Run as user VDRUSER in case vdr was started as user 'root'. Starting vdr as 
-# 'root' is necessary if the system time shall be set from the transponder 
+# Run as user VDRUSER in case vdr was started as user 'root'. Starting vdr as
+# 'root' is necessary if the system time shall be set from the transponder
 # data, but for security reasons vdr can switch to a lesser privileged user
 # id during normal operation.
 USER=""
 
-# Write the EPG data into EPGFILE. Default is /video/epg.data. 
-# Use EPGFILE=- to disable this. If EPGFILE is a directory, the file 
+# Write the EPG data into EPGFILE. Default is /video/epg.data.
+# Use EPGFILE=- to disable this. If EPGFILE is a directory, the file
 # epg.data will be created in that directory.
 EPGFILE=""
 
@@ -141,9 +141,9 @@ WATCHDOG=90
 # Set to anything to activate:
 DAEMON=
 
-# Write images from the SVDRP command GRAB into the given directory. 
-# GRAB must be the full path name of an existing directory, without 
-# any "..", double '/' or symlinks. By default, or if GRAB=- is given, 
+# Write images from the SVDRP command GRAB into the given directory.
+# GRAB must be the full path name of an existing directory, without
+# any "..", double '/' or symlinks. By default, or if GRAB=- is given,
 # grabbing images to disk is disabled.
 GRAB=
 
@@ -158,7 +158,7 @@ NOKBD=
 # If not set, or set to 0, don't use rcu.
 RCU=
 
-# encode special characters in recording names to avoid problems 
+# encode special characters in recording names to avoid problems
 # with VFAT file systems
 VFAT=
 
@@ -186,7 +186,7 @@ RUNVDRPID=/var/run/runvdr.pid
 # Set the controlling terminal. For example, /dev/tty8
 TERMINAL="/dev/tty8"
 
-# Switch console to some terminal? Needs terminal number. 
+# Switch console to some terminal? Needs terminal number.
 # For example, SWITCHTERMINAL=8
 SWITCHTERMINAL=8
 
@@ -197,8 +197,8 @@ SWITCHTERMINAL=8
 # Set character set that VDR shoud use
 # VDR_CHARSET_OVERRIDE="ISO-8859-15"
 
-# If VDR restarts automatically, only do this number of restarts before giving up
-# Setting this to 0 will cancel any restart attempt of VDR
+# If VDR restarts automatically, only do this number of restarts before giving
+# up. Setting this to 0 will cancel any restart attempt of VDR
 MAXRESTARTS=5
 
 # Only count restart attempts where VDR did not run longer than # seconds
@@ -211,7 +211,7 @@ DVBUNLOADONEXIT=
 
 # Additional parameters to pass to VDR directly, without parsing:
 # Add them without extra quoting, like AddParams -a -b -c "Some Parameter"
-AddParams 
+AddParams
 
 # Command wrapper. Will be placed in front of the VDR command.
 # Example: