Merge pull request #57 from wipedlife/master

Grammar Nazi. Delete not exist option.

README.md

@@ -17,14 +17,27 @@ Notice: git submodules are used so make sure to clone this repository recursivel
 * libssl
 
 ```bash
-sudo apt-get install \
-    libboost-chrono-dev \
+
+depend="libboost-chrono-dev \
     libboost-date-time-dev \
     libboost-filesystem-dev \
     libboost-program-options-dev \
     libboost-system-dev \
     libboost-thread-dev \
-    libssl-dev
+    libssl-dev"
+kernel=`uname -a`
+
+case "$kernel" in
+*ubuntu*)
+	sudo apt install $depend;;
+*debian*)
+	sudo aptitude install $depend;;
+*gentoo*)
+	sudo emerge --deep --newuse dev-libs/boost dev-libs/openssl;;
+
+*)
+	echo "Just install libboost and libopenssl dev packages on your pc";;
+esac
 ```
 
 ### Building
@@ -84,7 +97,7 @@ Vanity generation adress.
 
 #### Usage
 
-./vain privatekey.dat prefix <threads> <signature>
+./vain --usage
 
 #### Time to Generate on a 2.70GHz Processor
 | characters| time to generate (approx.) |

vanitygen.cpp

@@ -1,5 +1,5 @@
 #include "vanity.hpp"
-#include<regex.h>
+#include<regex>
 #include<getopt.h>
 
 
@@ -8,7 +8,7 @@ static struct{
         int threads=-1;
         i2p::data::SigningKeyType signature;
         std::string outputpath="";
-        regex_t regex;
+        std::regex regex;
 
 }options;
 
@@ -112,17 +112,12 @@ static inline size_t ByteStreamToBase32 (const uint8_t * inBuf, size_t len, char
 	return ret;
 }
 
-static inline bool NotThat(const char * what, const regex_t * reg){
-	int ret =  regexec(reg, what, 0, 0, 0);
-	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 * what, const std::regex & reg){
+	return std::regex_match(what,reg) == 1 ? false : true;
 }
 
 static inline bool NotThat(const char * a, const char *b)
 {
-
 	while(*b)
 		if(*a++!=*b++)
 			return true;
@@ -188,7 +183,7 @@ Orignal is sensei of crypto ;)
 
 		//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)
 		{
 		 	ByteStreamToBase32 ((uint8_t*)hash, 32, addr, 52);
@@ -217,15 +212,15 @@ Orignal is sensei of crypto ;)
 
 
 
-void usaging(void){
+void usage(void){
 	const constexpr char * help="vain pattern [options]\n"
 	"-h --help help menu\n"
 	"-r --reg  regexp instead just text pattern\n"
 	"--threads -t (default count of system)\n"
 	"--signature -s (signature type)\n"
 	"-o --output output file(default private.dat)\n"
-	"--usage usaging\n"
-	"--prefix -p\n"
+	"--usage usage\n"
+	//"--prefix -p\n"
 	"";
 	puts(help);
 }
@@ -248,11 +243,11 @@ void parsing(int argc, char ** args){
 		switch(c){
 			case 0:
 				if ( std::string(long_options[option_index].name) == std::string("usage") ){
-					usaging();
+					usage();
 					exit(1);
 				}
 			case 'h':
-				usaging();
+				usage();
 				exit(0);
 				break;
 			case 'r':
@@ -285,7 +280,7 @@ int main (int argc, char * argv[])
 
 	if ( argc < 2 )
 	{
-		usaging();
+		usage();
 		return 0;
 	}
 	parsing( argc > 2 ? argc-1 : argc, argc > 2 ? argv+1 : argv);
@@ -295,11 +290,12 @@ int main (int argc, char * argv[])
 		std::cout << "Not correct prefix(just string)" << std::endl;
 		return 1;
 	}else{
-		int ret = regcomp( &options.regex, argv[1], REG_EXTENDED );
-		if( ret != 0 ){
-			std::cerr << "Can't create regexp pattern from " << argv[1] << std::endl;
-			return 1;
-		}
+		options.regex=std::regex(argv[1]);
+//		int ret = regcomp( &options.regex, argv[1], REG_EXTENDED );
+//		if( ret != 0 ){
+//			std::cerr << "Can't create regexp pattern from " << argv[1] << std::endl;
+//			return 1;
+//		}
 	}
 
 	i2p::crypto::InitCrypto (false);