From f50685fe289396914b8d44187734fe3634f2ff97 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 6 Oct 2017 16:22:25 +0300 Subject: [PATCH 1/5] Support mnzd and mnz-cli --- src/bitcoin-cli.cpp | 2 +- src/bitcoind.cpp | 6 +++--- src/komodo_utils.h | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 7804cbc08..bb9aeb580 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -86,7 +86,7 @@ static bool AppInitRPC(int argc, char* argv[]) // Parameters // ParseParameters(argc, argv); - komodo_args(); + komodo_args(argv[0]); if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (!mapArgs.count("-version")) { diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 7679fa961..8a840a343 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -106,9 +106,9 @@ bool AppInit(int argc, char* argv[]) try { - void komodo_args(); - komodo_args(); - fprintf(stderr,"call komodo_args NOTARY_PUBKEY.(%s)\n",NOTARY_PUBKEY.c_str()); + void komodo_args(char *argv0); + komodo_args(argv[0]); + fprintf(stderr,"call komodo_args.(%s) NOTARY_PUBKEY.(%s)\n",argv[0],NOTARY_PUBKEY.c_str()); while ( ASSETCHAIN_INIT == 0 ) { //if ( komodo_is_issuer() != 0 ) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 28e91b540..bd25ae3a9 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1468,7 +1468,7 @@ int32_t komodo_whoami(char *pubkeystr,int32_t height) return(notaryid); } -void komodo_args() +void komodo_args(char *argv0) { extern int64_t MAX_MONEY; std::string name,addn; char *dirname,fname[512],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,baseid,len; @@ -1482,6 +1482,8 @@ void komodo_args() KOMODO_PAX = 1; } else KOMODO_PAX = GetArg("-pax",0); name = GetArg("-ac_name",""); + if ( argv0 != 0 && (strcmp(argv0,"mnzd") == 0 || strcmp(argv0,"mnz-cli") == 0) ) + name = "MNZ"; if ( (KOMODO_REWIND= GetArg("-rewind",0)) != 0 ) { printf("KOMODO_REWIND %d\n",KOMODO_REWIND); From e4f820a0c82508c922bc4974ef1caf4077083566 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 6 Oct 2017 16:28:23 +0300 Subject: [PATCH 2/5] Test --- src/komodo_utils.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index bd25ae3a9..af461ea01 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1482,8 +1482,12 @@ void komodo_args(char *argv0) KOMODO_PAX = 1; } else KOMODO_PAX = GetArg("-pax",0); name = GetArg("-ac_name",""); - if ( argv0 != 0 && (strcmp(argv0,"mnzd") == 0 || strcmp(argv0,"mnz-cli") == 0) ) - name = "MNZ"; + if ( argv0 != 0 ) + { + printf("ARGV0.(%s)\n",argv0); + if ( strcmp(argv0,"mnzd") == 0 || strcmp(argv0,"mnz-cli") == 0 ) + name = "MNZ"; + } if ( (KOMODO_REWIND= GetArg("-rewind",0)) != 0 ) { printf("KOMODO_REWIND %d\n",KOMODO_REWIND); From 8bd5fa4226502776a10b4522029a6a74a0697c79 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 6 Oct 2017 16:40:19 +0300 Subject: [PATCH 3/5] Test --- src/komodo_utils.h | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index af461ea01..bada861a1 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1468,10 +1468,20 @@ int32_t komodo_whoami(char *pubkeystr,int32_t height) return(notaryid); } +char *argv0suffix[] = +{ + "mnzd", "mnz-cli", "mnzd.exe", "mnz-cli.exe" +}; + +char *argv0names[] = +{ + "MNZ", "MNZ", "MNZ", "MNZ" +} + void komodo_args(char *argv0) { extern int64_t MAX_MONEY; - std::string name,addn; char *dirname,fname[512],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,baseid,len; + std::string name,addn; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,baseid,len,n; IS_KOMODO_NOTARY = GetBoolArg("-notary", false); if ( (KOMODO_EXCHANGEWALLET= GetBoolArg("-exchange", false)) != 0 ) fprintf(stderr,"KOMODO_EXCHANGEWALLET mode active\n"); @@ -1485,8 +1495,16 @@ void komodo_args(char *argv0) if ( argv0 != 0 ) { printf("ARGV0.(%s)\n",argv0); - if ( strcmp(argv0,"mnzd") == 0 || strcmp(argv0,"mnz-cli") == 0 ) - name = "MNZ"; + len = (int32_t)strlen(argv0); + for (i=0; i Date: Fri, 6 Oct 2017 16:42:23 +0300 Subject: [PATCH 4/5] Test --- src/komodo_utils.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index bada861a1..20a41b5c3 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1470,13 +1470,13 @@ int32_t komodo_whoami(char *pubkeystr,int32_t height) char *argv0suffix[] = { - "mnzd", "mnz-cli", "mnzd.exe", "mnz-cli.exe" + (char *)"mnzd", (char *)"mnz-cli", (char *)"mnzd.exe", (char *)"mnz-cli.exe" }; char *argv0names[] = { - "MNZ", "MNZ", "MNZ", "MNZ" -} + (char *)"MNZ", (char *)"MNZ", (char *)"MNZ", (char *)"MNZ" +}; void komodo_args(char *argv0) { From a3499886299c045da2890783468beaeb8a011235 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 6 Oct 2017 16:44:29 +0300 Subject: [PATCH 5/5] Test --- src/komodo_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 20a41b5c3..9a0a3bb16 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1494,14 +1494,14 @@ void komodo_args(char *argv0) name = GetArg("-ac_name",""); if ( argv0 != 0 ) { - printf("ARGV0.(%s)\n",argv0); len = (int32_t)strlen(argv0); for (i=0; i matches suffix (%s) -> ac_name.(%s)\n",argv0,argv0suffix[i],argv0names[i]); + name = argv0names[i]; break; } }