From 0b1249b3722a94272c17918b5504c7804acebcea Mon Sep 17 00:00:00 2001
From: Ward Wouts <ward@wouts.nl>
Date: Sun, 20 Apr 2003 20:15:34 +0000
Subject: [PATCH] fix filename matching

---
 trunk/ripnews/encode/uuencode.rb | 11 ++++++++---
 trunk/ripnews/encode/yenc.rb     | 14 +++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/trunk/ripnews/encode/uuencode.rb b/trunk/ripnews/encode/uuencode.rb
index 1d403d4..ed659db 100644
--- a/trunk/ripnews/encode/uuencode.rb
+++ b/trunk/ripnews/encode/uuencode.rb
@@ -1,6 +1,6 @@
 #################################
 #
-# $Dwarf: uuencode.rb,v 1.3 2003/04/20 16:58:07 ward Exp $
+# $Dwarf: uuencode.rb,v 1.4 2003/04/20 18:02:51 ward Exp $
 # $Source$
 #
 # article.rb
@@ -159,8 +159,13 @@ def is_uuencoded(data)
 end
 
 def get_filename(data)
-	if data.to_s =~ /^begin(\s+(\d+))?(\s+(.*?\S))?\s*$/m
-		return $4
+	i = 0
+	while i < data.length
+		line = data[i]
+		if line =~ /^begin(\s+(\d+))?(\s+(.*?\S))?\s*$/m
+			return $4
+		end
+		i += 1
 	end
 	return false
 end
diff --git a/trunk/ripnews/encode/yenc.rb b/trunk/ripnews/encode/yenc.rb
index d184f47..d42329d 100644
--- a/trunk/ripnews/encode/yenc.rb
+++ b/trunk/ripnews/encode/yenc.rb
@@ -1,6 +1,6 @@
 #################################
 #
-# $Dwarf: yenc.rb,v 1.2 2003/04/20 16:33:31 ward Exp $
+# $Dwarf: yenc.rb,v 1.3 2003/04/20 18:31:17 ward Exp $
 # $Source$
 #
 # article.rb
@@ -297,11 +297,15 @@ def is_yencoded(data)
 end
 
 def get_filename(data)
-	if data.to_s =~ /=ybegin\s*(part\=(\d+)\s+)?(total\=(\d+)\s+)?(line\=(\d+))(\s*size\=(\d+))(\s*name=(.*?\S))\s*$/m
-		return $10
-	else
-		return false
+	i = 0
+	while i < data.length
+		line = data[i]
+		if line =~ /=ybegin\s*(part\=(\d+)\s+)?(total\=(\d+)\s+)?(line\=(\d+))(\s*size\=(\d+))(\s*name=(.*?\S))\s*$/m
+			return $10
+		end
+		i += 1
 	end
+	return false
 end
 
 end # class