Updated PCRE library from version 8.21 to 8.31

Author: nickgammon

ProcessPreviousLine.cpp

@@ -556,7 +556,7 @@ assemble the full text of the original line.
   if (m_bUTF_8)
     {
     int erroroffset;
-    iBad = _pcre_valid_utf8 ((const unsigned char *) (const char *) strCurrentLine, 
+    iBad = _pcre_valid_utf ((const unsigned char *) (const char *) strCurrentLine, 
                              strCurrentLine.GetLength (), &erroroffset);
     if (iBad > 0)
       {

Utilities.cpp

@@ -2867,7 +2867,7 @@ int UMessageBox (const char * sText, UINT nType, const char * sTitle)
 
   // use PCRE to validate the string first - if bad, fall back to standard box
   int erroroffset;
-  iBad = _pcre_valid_utf8 ((unsigned char  *) sText, strlen (sText), &erroroffset);
+  iBad = _pcre_valid_utf ((unsigned char  *) sText, strlen (sText), &erroroffset);
   if (iBad > 0)
     return ::AfxMessageBox (sText, nType);
 
@@ -2886,7 +2886,7 @@ int UMessageBox (const char * sText, UINT nType, const char * sTitle)
 
   // now do title
 
-  iBad = _pcre_valid_utf8 ((unsigned char  *) sTitle, strlen (sTitle), &erroroffset);
+  iBad = _pcre_valid_utf ((unsigned char  *) sTitle, strlen (sTitle), &erroroffset);
 
   // use PCRE to validate the title next - if bad, use "MUSHclient" title
   if (iBad > 0)

dialogs/DebugWorldInputDlg.cpp

@@ -195,7 +195,7 @@ int nItem = m_ctlSpecials.GetCurSel ();
 	pCmdUI->Enable(nItem != LB_ERR);
 }
 
-extern "C" int _pcre_ord2utf8(int cvalue, unsigned char *buffer);
+extern "C" int _pcre_ord2utf(int cvalue, unsigned char *buffer);
 
 void CDebugWorldInputDlg::OnInsertUnicode() 
 {
@@ -208,7 +208,7 @@ CInsertUnicodeDlg dlg;
 
 unsigned char utf8 [10];
 
-int iLen = _pcre_ord2utf8 (dlg.m_iCode, utf8);
+int iLen = _pcre_ord2utf (dlg.m_iCode, utf8);
 
 
 CString strText;

install/readme.txt

@@ -1,7 +1,7 @@
 MUSHclient version 4.82
 =======================
 
-Tuesday, 3rd January 2012
+Tuesday, 22nd September 2012
 
 Author: Nick Gammon
 Web support: http://www.gammon.com.au/forum/

miniwindow.cpp

@@ -764,7 +764,7 @@ static long CalculateUTF8length (LPCTSTR Text, size_t length)
   {
 
   int erroroffset;
-  int iBad = _pcre_valid_utf8 ((unsigned char  *) Text, length, &erroroffset);
+  int iBad = _pcre_valid_utf ((unsigned char  *) Text, length, &erroroffset);
   if (iBad > 0)
     return -1;
 

pcre/readme.txt

@@ -1,8 +1,8 @@
 PCRE built as follows:
 
-1. Download: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.zip
+1. Download: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.31.zip
 
-2. Unzip the file pcre-8.21.zip
+2. Unzip the file pcre-8.31.zip
 
 
 3. Copy the following files to the mushclient source "pcre" directory:
@@ -43,6 +43,7 @@ ucp.h
 5. Edit: pcre_compile.c and add:
 
 #pragma warning( disable : 4018)  // '<' : signed/unsigned mismatch
+#pragma warning( disable : 4127)  // conditional expression is constant
 #pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
 #pragma warning( disable : 4701)  // local variable 'othercase' may be used without having been initialized
 
@@ -65,3 +66,9 @@ and add:
 to the start of each file.	
 
 
+7. Edit	pcre_exec.c and add:
+
+#pragma warning( disable : 4127)  // conditional expression is constant
+
+to the start of the file.	
+

scripting/lua_utils.cpp

@@ -1068,7 +1068,7 @@ unsigned char utf8 [10];    // UTF-8 should be max 6 characters
           luaL_error (L,
              "Unicode code (%f) at index [%d] of table at argument #%d to 'utf8encode' has decimal places", f, j, i);
 
-        int iLen = _pcre_ord2utf8 (n, utf8);
+        int iLen = _pcre_ord2utf (n, utf8);
 
         // we do it this way so we can correctly append 0x00
         sOutput.append ((const char *) utf8, iLen);
@@ -1090,7 +1090,7 @@ unsigned char utf8 [10];    // UTF-8 should be max 6 characters
          luaL_error (L, 
           "Unicode code (%f) at argument #%d to 'utf8encode' has decimal places", f, i);
 
-      int iLen = _pcre_ord2utf8 (n, utf8);
+      int iLen = _pcre_ord2utf (n, utf8);
 
       // we do it this way so we can correctly append 0x00
       sOutput.append ((const char *) utf8, iLen);
@@ -1347,7 +1347,7 @@ size_t length;
 const char * data = luaL_checklstring (L, 1, &length);
 
   int erroroffset;
-  int iBad = _pcre_valid_utf8 ((unsigned char  *) data, length, &erroroffset);
+  int iBad = _pcre_valid_utf ((unsigned char  *) data, length, &erroroffset);
 
   if (iBad > 0)
     {
@@ -1393,7 +1393,7 @@ static int utf8sub (lua_State *L) {
   // validate
 
   int erroroffset;
-  int iBad = _pcre_valid_utf8 ((unsigned char  *) s, length, &erroroffset);
+  int iBad = _pcre_valid_utf ((unsigned char  *) s, length, &erroroffset);
 
   if (iBad > 0)
     {

stdafx.h

@@ -801,8 +801,8 @@ extern "C"
 
 // stuff we borrow from PCRE
 
-extern "C" int _pcre_valid_utf8(const unsigned char  *buf, int length, int * erroroffset);
-extern "C" int _pcre_ord2utf8(int cvalue, unsigned char *buffer);
+extern "C" int _pcre_valid_utf(const unsigned char  *buf, int length, int * erroroffset);
+extern "C" int _pcre_ord2utf(int cvalue, unsigned char *buffer);
 extern "C" const unsigned char _pcre_utf8_table4[];
 
 // i18n stuff