[M-CVS] CVS: M/src/modules/viewflt PGP.cpp,1.6,1.7 Trailer.cpp,1.6,1.7

[Xavier N. <no...@us...>]

Update of /cvsroot/mahogany/M/src/modules/viewflt
In directory sc8-pr-cvs1:/tmp/cvs-serv17367/src/modules/viewflt

Modified Files:
	PGP.cpp Trailer.cpp 
Log Message:
1. Fix the trailer filter in case the text is only "\r\n"
2. Fix a compilation problem in PGP.cpp on MSVC

Index: PGP.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/viewflt/PGP.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- PGP.cpp	3 Dec 2002 13:31:33 -0000	1.6
+++ PGP.cpp	4 Dec 2002 09:35:27 -0000	1.7
@@ -277,5 +277,5 @@
          {
             // try to decrypt
-            MCryptoEngine::Status rc = m_engine->Decrypt(in, out);
+            MCryptoEngine::Status rc = (MCryptoEngine::Status) m_engine->Decrypt(in, out);
             if ( rc != MCryptoEngine::OK )
             {

Index: Trailer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/viewflt/Trailer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- Trailer.cpp	2 Dec 2002 12:25:12 -0000	1.6
+++ Trailer.cpp	4 Dec 2002 09:35:27 -0000	1.7
@@ -91,5 +91,5 @@
       // (a) checking that it consists solely of delimiter characters
       //     if there is a chance that this is a delimiter line
-      while ( chDel != '\0' && *pc != '\n' && pc >= start )
+      while ( chDel != '\0' && *pc != '\n' && pc > start )
       {
          if ( *pc-- != chDel )
@@ -134,5 +134,5 @@
       //else: no
 
-      if ( pc == start )
+      if ( pc <= start )
       {
          // we came to the very beginning of the message and found nothing