From cf45c66062b61e46cb796702dad85854528a3a16 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 30 Aug 2003 14:52:58 +0200
Subject: [PATCH] Fixed handling extra blanks in plugin command lines

---
 HISTORY  | 1 +
 plugin.c | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 01c4d77a..8a11f1a5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2344,3 +2344,4 @@ Video Disk Recorder Revision History
 - Fixed displaying still pictures, now using the driver's VIDEO_STILLPICTURE call
   directly (thanks to Oliver Endriss). This also improves navigating through DVD
   menus with the DVD plugin.
+- Fixed handling extra blanks in plugin command lines.
diff --git a/plugin.c b/plugin.c
index 74395348..a0d27011 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.9 2003/05/09 15:01:26 kls Exp $
+ * $Id: plugin.c 1.10 2003/08/30 14:52:58 kls Exp $
  */
 
 #include "plugin.h"
@@ -170,7 +170,7 @@ bool cDll::Load(bool Log)
      if (plugin && args) {
         int argc = 0;
         char *argv[MAXPLUGINARGS];
-        char *p = args;
+        char *p = skipspace(stripspace(args));
         char *q = NULL;
         bool done = false;
         while (!done) {
@@ -205,7 +205,7 @@ bool cDll::Load(bool Log)
                                }
                             }
                          if (!done)
-                            p++;
+                            p = *p ? p + 1 : skipspace(p + 1);
                 }
               }
         argv[argc] = NULL;
@@ -278,7 +278,7 @@ void cPluginManager::AddPlugin(const char *Args)
         }
      return;
      }
-  char *s = strdup(Args);
+  char *s = strdup(skipspace(Args));
   char *p = strchr(s, ' ');
   if (p)
      *p = 0;