mhonarc-commits
[Top] [All Lists]

CVS: mhonarc/MHonArc/lib mhtxtplain.pl,2.32,2.33

2002-12-09 16:21:56
Update of /cvsroot/mhonarc/mhonarc/MHonArc/lib
In directory subversions:/tmp/cvs-serv29364

Modified Files:
	mhtxtplain.pl 
Log Message:
[Bug #1944] Fixed bogus cannot convert warning.  If $$data is the
empty string, we return a single space character to avoid warning.


Index: mhtxtplain.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhtxtplain.pl,v
retrieving revision 2.32
retrieving revision 2.33
diff -C2 -r2.32 -r2.33
*** mhtxtplain.pl	4 Dec 2002 19:29:54 -0000	2.32
--- mhtxtplain.pl	9 Dec 2002 23:21:52 -0000	2.33
***************
*** 13,17 ****
  ##---------------------------------------------------------------------------##
  ##    MHonArc -- Internet mail-to-HTML converter
! ##    Copyright (C) 1995-2001	Earl Hood, mhonarc(_at_)mhonarc(_dot_)org
  ##
  ##    This program is free software; you can redistribute it and/or modify
--- 13,17 ----
  ##---------------------------------------------------------------------------##
  ##    MHonArc -- Internet mail-to-HTML converter
! ##    Copyright (C) 1995-2002	Earl Hood, mhonarc(_at_)mhonarc(_dot_)org
  ##
  ##    This program is free software; you can redistribute it and/or modify
***************
*** 42,48 ****
  $Url    	= '(http://|https://|ftp://|afs://|wais://|telnet://|ldap://' .
  		   '|gopher://|news:|nntp:|mid:|cid:|mailto:|prospero:)';
! $UrlExp 	= $Url . q/[^\s\(\)\|<>"']*[^\.?!;,"'\|\[\]\(\)\s<>]/;
! $HUrlExp        = $Url . q/(?:&(?![gl]t;)|[^\s\(\)\|<>"'\&])+/ .
! 			 q/[^\.?!;,"'\|\[\]\(\)\s<>\&]/;
  $QuoteChars	= '[>]';
  $HQuoteChars	= '&gt;';
--- 42,49 ----
  $Url    	= '(http://|https://|ftp://|afs://|wais://|telnet://|ldap://' .
  		   '|gopher://|news:|nntp:|mid:|cid:|mailto:|prospero:)';
! $UrlExp 	= $Url . q/[^\s\(\)\|<>"'\0-\037]+/ .
! 			 q/[^\.?!;,"'\|\[\]\(\)\s<>\0-\037]/;
! $HUrlExp        = $Url . q/(?:&(?![gl]t;)|[^\s\(\)\|<>"'\&\0-\037])+/ .
! 			 q/[^\.?!;,"'\|\[\]\(\)\s<>\&\0-\037]/;
  $QuoteChars	= '[>]';
  $HQuoteChars	= '&gt;';
***************
*** 543,546 ****
--- 544,548 ----
  	unless $nourl;
  
+     $$data = ' '  if $$data eq '';
      ($$data);
  }

---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV