diff options
Diffstat (limited to 'security/libbeid/files/patch-common')
| -rw-r--r-- | security/libbeid/files/patch-common | 149 |
1 files changed, 26 insertions, 123 deletions
diff --git a/security/libbeid/files/patch-common b/security/libbeid/files/patch-common index 87ab86a8abfa..7ecaad66e218 100644 --- a/security/libbeid/files/patch-common +++ b/security/libbeid/files/patch-common @@ -1,5 +1,7 @@ ---- common/src/bytearrayreader.cpp.orig -+++ common/src/bytearrayreader.cpp +Index: common/src/bytearrayreader.cpp +=================================================================== +--- common/src/bytearrayreader.cpp (revision 1614) ++++ common/src/bytearrayreader.cpp (working copy) @@ -24,7 +24,6 @@ #include "bytearrayreader.h" #include "bytearray.h" @@ -8,9 +10,11 @@ /***************** ByteArray **************************/ ---- common/src/datafile.cpp.orig -+++ common/src/datafile.cpp -@@ -243,8 +243,7 @@ +Index: common/src/datafile.cpp +=================================================================== +--- common/src/datafile.cpp (revision 1614) ++++ common/src/datafile.cpp (working copy) +@@ -249,8 +249,7 @@ bool CDataFile::Load(bool bLock) while ( !bDone ) { memset(buffer, 0, MAX_BUFFER_LEN); @@ -20,7 +24,7 @@ szLine = buffer; Trim(szLine); -@@ -1004,8 +1003,7 @@ +@@ -1011,8 +1010,7 @@ int WriteLn(FILE * stream, wchar_t* fmt, if ( buf[nLength] != '\n' && buf[nLength] != '\r' ) buf[nLength++] = '\n'; @@ -30,32 +34,15 @@ return nLength; } ---- common/src/dynamiclib.cpp.orig -+++ common/src/dynamiclib.cpp -@@ -42,7 +42,7 @@ - - void * CDynamicLib::GetAddress(const std::string & csFunctionName) - { -- if (m_module != m_module) -+ if (m_module == NULL) - return NULL; - - return PlatformGetAddress(csFunctionName.c_str()); -@@ -50,7 +50,7 @@ - - void CDynamicLib::Close() - { -- if (m_module != m_module) -+ if (m_module != NULL) - return PlatformClose(); - - m_module = NULL; ---- common/src/logbase.cpp.orig -+++ common/src/logbase.cpp -@@ -29,11 +29,7 @@ +Index: common/src/logbase.cpp +=================================================================== +--- common/src/logbase.cpp (revision 1614) ++++ common/src/logbase.cpp (working copy) +@@ -29,12 +29,7 @@ #include "mw_util.h" #ifndef WIN32 +-#include <malloc.h> -#ifdef LINUX #include "wintypes.h" -#else @@ -64,7 +51,7 @@ #include "sys/stat.h" #include "util.h" -@@ -567,6 +563,7 @@ +@@ -575,6 +570,7 @@ bool CLog::open(bool bWchar) else err = fopen_s(&m_f,utilStringNarrow(filename).c_str(),"a"); #else @@ -72,37 +59,10 @@ m_f = fopen(utilStringNarrow(filename).c_str(),"a, ccs=UTF-8"); if (m_f == NULL) err=errno; #endif ---- common/src/mw_util.cpp.orig -+++ common/src/mw_util.cpp -@@ -271,7 +271,7 @@ - - if (r != -1 && csTmp != NULL) - { -- r = fprintf(stream, csTmp); -+ r = fputs(csTmp, stream); - free(csTmp); - } - -@@ -289,7 +289,7 @@ - - if (r != -1 && csTmp != NULL) - { -- r = fprintf(stream, csTmp); -+ r = fputs(csTmp, stream); - free(csTmp); - } - -@@ -306,7 +306,7 @@ - - if (r != -1 && csTmp != NULL) - { -- r = fprintf(stream, csTmp); -+ r = fputs(csTmp, stream); - free(csTmp); - } - ---- common/src/mw_util.h.orig -+++ common/src/mw_util.h +Index: common/src/mw_util.h +=================================================================== +--- common/src/mw_util.h (revision 1614) ++++ common/src/mw_util.h (working copy) @@ -38,7 +38,6 @@ #endif @@ -111,50 +71,11 @@ #endif #ifndef HAVE_ERRNO_T ---- common/src/mwexception.cpp.orig -+++ common/src/mwexception.cpp -@@ -34,14 +34,14 @@ - - // CMWEXCEPTION::CMWEXCEPTION(long lError, const char *cpFile, long lLine) - CMWException::CMWException(long lError, const char *cpFile, long lLine) --: m_lError(lError), -- m_sFile(cpFile), -+: m_sFile(cpFile), -+ m_lError(lError), - m_lLine(lLine) - - { - } - --const char* CMWException::what() throw() -+const char* CMWException::what() const throw() - { - return "CMWException, error code strings to be implemented"; - } ---- common/src/mwexception.h.orig -+++ common/src/mwexception.h -@@ -37,7 +37,7 @@ - //CMWException(long lError); - CMWException(long lError, const char *cpFile, long lLine); - ~CMWException () throw(){}; -- virtual const char* what() throw(); -+ virtual const char* what() const throw(); - - long GetError() const {return m_lError;}; - std::string GetFile() const {return m_sFile;}; ---- common/src/socket/socketclient.cpp.orig -+++ common/src/socket/socketclient.cpp -@@ -23,6 +23,7 @@ - #include "../util.h" - - #ifndef WIN32 -+#include <netinet/in.h> - #include <errno.h> - #endif - ---- common/src/util.cpp.orig -+++ common/src/util.cpp -@@ -348,7 +348,7 @@ +Index: common/src/util.cpp +=================================================================== +--- common/src/util.cpp (revision 1614) ++++ common/src/util.cpp (working copy) +@@ -348,7 +348,7 @@ void GetProcessName(wchar_t *wBuffer,uns /* Get our PID and build the name of the link in /proc */ pid = getpid(); @@ -163,21 +84,3 @@ { /* This should only happen on large word systems. I'm not sure what the proper response is here. -@@ -474,7 +474,7 @@ - - if (r != -1 && csTmp != NULL) - { -- r = fprintf(stream, csTmp); -+ r = fputs(csTmp, stream); - free(csTmp); - } - -@@ -490,7 +490,7 @@ - - if (r != -1 && csTmp != NULL) - { -- r = fprintf(stream, csTmp); -+ r = fputs(csTmp, stream); - free(csTmp); - } - |