diff mbox

VDR version 1.3.38 incompatible with vdradmin?

Message ID 87oe2esouw.fsf@gandalf.hd.free.fr
State New
Headers

Commit Message

Dominique Dumont Jan. 14, 2006, 5:25 p.m. UTC 
  Dave P <vdr@pickles.me.uk> writes:

> OK, here's a quick-and-dirty patch to restore functionality to vdradmin 
> 0.97-am3.4.2 (this will word-wrap).

IMHO, using a "anything but white space" class in the regular
expression is safer than using _several_ non-greedy quantifiers.

So I suggest this patch, which also works:
diff mbox

Patch

--- vdradmind.pl~       2006-01-05 22:29:17.000000000 +0100
+++ vdradmind.pl        2006-01-14 18:14:32.000000000 +0100
@@ -735,7 +735,7 @@ 
                        else {
                                $bc++;
                                while($_ = $SVDRP->readoneline) {
-                                       if(/^E (.*) (.*) (.*) (.*)/ || /^E (.*) (.*) (.*)/) {
+                                       if(/^E ([^\s]*) ([^\s]*) ([^\s]*) /) {
                                                my($event_id, $time, $duration) = ($1, $2, $3);
                                                my($title, $subtitle, $summary);
                                                while($_ = $SVDRP->readoneline) {