1 --- cvsspam-0.2.12/cvsspam.rb 2010-04-07 18:27:22.000000000 +0300
2 +++ cvsspam-0.2.12/cvsspam.rb 2010-04-07 18:27:22.000000000 +0300
5 # test to see of the given string contains non-ASCII characters
6 def requires_rfc2047?(word)
7 - (word =~ /[\177-\377]/) != nil
8 + (word.force_encoding('ASCII-8BIT') =~ /[\177-\377]/) != nil
13 cvsroot_dir = "#{ENV['CVSROOT']}/CVSROOT"
14 $config = "#{cvsroot_dir}/cvsspam.conf"
15 $users_file = "#{cvsroot_dir}/users"
16 -$users_file_charset = nil
17 +$users_file_charset = 'utf-8'
22 if File.exists?($users_file)
23 File.open($users_file) do |io|
24 io.each_line do |line|
25 + line.force_encoding($users_file_charset)
26 if line =~ /^([^:]+)\s*:\s*(['"]?)([^\n\r]+)(\2)/
27 if email.address == $1
28 return EmailAddress.new($3, $users_file_charset)