highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1901 from laanwj/2012_10_remove_strlcpy

Browse Source 
get rid of strlcpy.h
This commit is contained in:
Wladimir J. van der Laan
2012-10-11 00:39:51 -07:00
parent eb49457ff2 6032e4f4e7
commit ac0ad5dc63
7 changed files with 30 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/netbase.cpp
View File

@@ -11,8 +11,8 @@
#include <sys/fcntl.h>
#endif
#include "strlcpy.h"
#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
#include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
using namespace std;
@@ -119,18 +119,16 @@ bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsign
bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup)
{
if (pszName[0] == 0)
std::string str(pszName);
std::string strHost = str;
if (str.empty())
return false;
char psz[256];
char *pszHost = psz;
strlcpy(psz, pszName, sizeof(psz));
if (psz[0] == '[' && psz[strlen(psz)-1] == ']')
if (boost::algorithm::starts_with(str, "[") && boost::algorithm::ends_with(str, "]"))
{
pszHost = psz+1;
psz[strlen(psz)-1] = 0;
strHost = str.substr(1, str.size() - 2);
}
return LookupIntern(pszHost, vIP, nMaxSolutions, fAllowLookup);
return LookupIntern(strHost.c_str(), vIP, nMaxSolutions, fAllowLookup);
}
bool LookupHostNumeric(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions)