mirror of
https://github.com/PurpleI2P/i2pd-tools.git
synced 2025-01-22 13:27:17 +01:00
cxx regex
This commit is contained in:
parent
3c7e4d31e9
commit
88adabda6c
|
@ -1,5 +1,5 @@
|
||||||
#include "vanity.hpp"
|
#include "vanity.hpp"
|
||||||
#include<regex.h>
|
#include<regex>
|
||||||
#include<getopt.h>
|
#include<getopt.h>
|
||||||
|
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ static struct{
|
||||||
int threads=-1;
|
int threads=-1;
|
||||||
i2p::data::SigningKeyType signature;
|
i2p::data::SigningKeyType signature;
|
||||||
std::string outputpath="";
|
std::string outputpath="";
|
||||||
regex_t regex;
|
std::regex regex;
|
||||||
|
|
||||||
}options;
|
}options;
|
||||||
|
|
||||||
|
@ -112,17 +112,12 @@ static inline size_t ByteStreamToBase32 (const uint8_t * inBuf, size_t len, char
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool NotThat(const char * what, const regex_t * reg){
|
static inline bool NotThat(const char * what, const std::regex & reg){
|
||||||
int ret = regexec(reg, what, 0, 0, 0);
|
return std::regex_match(what,reg) == 1 ? false : true;
|
||||||
if( ret == REG_NOMATCH ) return true;
|
|
||||||
else if(ret == 0) return false;
|
|
||||||
std::cerr << "Some error in regexping" << std::endl;
|
|
||||||
exit(2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool NotThat(const char * a, const char *b)
|
static inline bool NotThat(const char * a, const char *b)
|
||||||
{
|
{
|
||||||
|
|
||||||
while(*b)
|
while(*b)
|
||||||
if(*a++!=*b++)
|
if(*a++!=*b++)
|
||||||
return true;
|
return true;
|
||||||
|
@ -188,7 +183,7 @@ Orignal is sensei of crypto ;)
|
||||||
|
|
||||||
//bool result = options.reg ? !NotThat(addr, &options.regex) : !NotThat(addr,prefix);
|
//bool result = options.reg ? !NotThat(addr, &options.regex) : !NotThat(addr,prefix);
|
||||||
|
|
||||||
if( ( options.reg ? !NotThat(addr, &options.regex) : !NotThat(addr,prefix) ) )
|
if( ( options.reg ? !NotThat(addr, options.regex) : !NotThat(addr,prefix) ) )
|
||||||
// if(result)
|
// if(result)
|
||||||
{
|
{
|
||||||
ByteStreamToBase32 ((uint8_t*)hash, 32, addr, 52);
|
ByteStreamToBase32 ((uint8_t*)hash, 32, addr, 52);
|
||||||
|
@ -295,11 +290,12 @@ int main (int argc, char * argv[])
|
||||||
std::cout << "Not correct prefix(just string)" << std::endl;
|
std::cout << "Not correct prefix(just string)" << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}else{
|
}else{
|
||||||
int ret = regcomp( &options.regex, argv[1], REG_EXTENDED );
|
options.regex=std::regex(argv[1]);
|
||||||
if( ret != 0 ){
|
// int ret = regcomp( &options.regex, argv[1], REG_EXTENDED );
|
||||||
std::cerr << "Can't create regexp pattern from " << argv[1] << std::endl;
|
// if( ret != 0 ){
|
||||||
return 1;
|
// std::cerr << "Can't create regexp pattern from " << argv[1] << std::endl;
|
||||||
}
|
// return 1;
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
i2p::crypto::InitCrypto (false);
|
i2p::crypto::InitCrypto (false);
|
||||||
|
|
Loading…
Reference in a new issue