#include "util.h"
#include "sync.h"
#include "version.h"
-#include "ui_interface.h"
+#include "interface.h"
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
#include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
#include <boost/thread.hpp>
#include <openssl/crypto.h>
#include <openssl/rand.h>
-#include <openssl/conf.h>
#ifdef WIN32
-#ifdef _MSC_VER
-#pragma warning(disable:4786)
-#pragma warning(disable:4804)
-#pragma warning(disable:4805)
-#pragma warning(disable:4717)
-#endif
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
ppmutexOpenSSL[i] = new CCriticalSection();
CRYPTO_set_locking_callback(locking_callback);
- // OpenSSL can optionally load a config file which lists optional loadable modules and engines.
- // We don't use them so we don't require the config. However some of our libs may call functions
- // which attempt to load the config file, possibly resulting in an exit() or crash if it is missing
- // or corrupt. Explicitly tell OpenSSL not to try to load the file. The result for our libs will be
- // that the config appears to have been loaded and there are no modules/engines available.
- OPENSSL_no_config();
-
#ifdef WIN32
// Seed random number generator with screen scrape and other hardware sources
RAND_screen();
char* p = buffer;
int limit = sizeof(buffer);
int ret;
- while (true)
+ for ( ; ; )
{
#ifndef _MSC_VER
va_list arg_ptr;
return;
string::size_type i1 = 0;
string::size_type i2;
- while (true)
+ for ( ; ; )
{
i2 = str.find(c, i1);
if (i2 == str.npos)
{
// convert hex dump to vector
vector<unsigned char> vch;
- while (true)
+ for ( ; ; )
{
while (isspace(*psz))
psz++;
int mode = 0;
int left = 0;
- while (1)
+ for ( ; ; )
{
int dec = decode64_table[(unsigned char)*p];
if (dec == -1) break;
int mode = 0;
int left = 0;
- while (1)
+ for ( ; ; )
{
int dec = decode32_table[(unsigned char)*p];
if (dec == -1) break;
bool WildcardMatch(const char* psz, const char* mask)
{
- while (true)
+ for ( ; ; )
{
switch (*mask)
{
pathRet = fs::path("/");
else
pathRet = fs::path(pszHome);
-#ifdef MAC_OSX
+#ifdef __APPLE__
// Mac
pathRet /= "Library/Application Support";
fs::create_directory(pathRet);
if (file && GetFilesize(file) > 10 * 1000000)
{
// Restart the file with some of the end
- char pch[200000];
- fseek(file, -((long long)sizeof(pch)), SEEK_END);
- size_t nBytes = fread(pch, 1, sizeof(pch), file);
- fclose(file);
-
- file = fopen(pathLog.string().c_str(), "w");
- if (file)
- {
- fwrite(pch, 1, nBytes, file);
+ try {
+ vector<char>* vBuf = new vector <char>(200000, 0);
+ fseek(file, -((long)(vBuf->size())), SEEK_END);
+ size_t nBytes = fread(&vBuf->operator[](0), 1, vBuf->size(), file);
fclose(file);
+ file = fopen(pathLog.string().c_str(), "w");
+ if (file)
+ {
+ fwrite(&vBuf->operator[](0), 1, nBytes, file);
+ fclose(file);
+ }
+ delete vBuf;
+ }
+ catch (const bad_alloc& e) {
+ // Bad things happen - no free memory in heap at program startup
+ fclose(file);
+ printf("Warning: %s in %s:%d\n ShrinkDebugFile failed - debug.log expands further", e.what(), __FILE__, __LINE__);
}
}
}
// System clock
int64_t GetTime()
{
- return time(NULL);
+ int64_t now = time(NULL);
+ assert(now > 0);
+ return now;
}
// Trusted NTP offset or median of NTP samples.
#if defined(PR_SET_NAME)
// Only the first 15 characters are used (16 - NUL terminator)
::prctl(PR_SET_NAME, name, 0, 0, 0);
-#elif 0 && (defined(__FreeBSD__) || defined(__OpenBSD__))
- // TODO: This is currently disabled because it needs to be verified to work
- // on FreeBSD or OpenBSD first. When verified the '0 &&' part can be
- // removed.
+#elif (defined(__FreeBSD__) || defined(__OpenBSD__))
pthread_set_name_np(pthread_self(), name);
-
-// This is XCode 10.6-and-later; bring back if we drop 10.5 support:
-// #elif defined(MAC_OSX)
-// pthread_setname_np(name);
-
+#elif defined(__APPLE__)
+ pthread_setname_np(name);
#else
// Prevent warnings for unused parameters...
(void)name;