mirrors
/
tcoin
mirror of https://github.com/login000/tcoin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactored send function in tcoin and pcoin 

Refactored the send function in tcoin and pcoin, and in the process,
fixed a bug in pcoin's silentsend function.
This commit is contained in:
login (tilde.institute) 2020-10-09 18:44:41 -04:00
parent e3cd47a6c7
commit 51a0f31676
2 changed files with 163 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
pcoin.cpp
View File

@ -1865,39 +1865,48 @@ int main(int argc, char *argv[])
if(!strcmp(argv[2], "-s"))
{
int return_value;
long long int amount = 0;
char *receiver = NULL;
if(is_number(argv[3]))
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "silent");
else
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "silent");
if(!return_value) //send was successful
{
if(is_number(argv[3]))
send_message(get_username().c_str(), argv[2], "", strtol100(argv[3]), "silent");
else
send_message(get_username().c_str(), argv[3], "", strtol100(argv[2]), "silent");
amount = strtol100(argv[3]);
receiver = argv[4];
}
else
{
amount = strtol100(argv[4]);
receiver = argv[3];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, "", amount, "silent");
}
else //argument count is 5 because a custom message was included
{
int return_value;
long long int amount = 0;
char* receiver = NULL;
return_value = message_is_long(argv[4]);
if(return_value) //message is too long
{
std::cout << "\nSorry, the message was longer than " << TCOIN_MSG_LENGTH_LIMIT << " characters. Please keep messages at or below this limit.\n\n";
return ERR_MAIN_MSG_TOO_LONG;
}
if(is_number(argv[3]))
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "verbose");
else
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "verbose");
if(!return_value) //send was successful
if(is_number(argv[2]))
{
if(is_number(argv[3]))
send_message(get_username().c_str(), argv[2], argv[4], strtol100(argv[3]), "verbose");
else
send_message(get_username().c_str(), argv[3], argv[4], strtol100(argv[2]), "verbose");
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "verbose");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, argv[4], amount, "verbose");
}
}
else if(argc == 6)
@ -1905,23 +1914,29 @@ int main(int argc, char *argv[])
if(!strcmp(argv[2], "-s"))
{ //argument count is 6 because of silent send with custom message included
int return_value;
long long int amount = 0;
char *receiver = NULL;
return_value = message_is_long(argv[5]);
if(return_value) //message is too long
{
std::cout << "\nSorry, the message was longer than " << TCOIN_MSG_LENGTH_LIMIT << " characters. Please keep messages at or below this limit.\n\n";
return ERR_MAIN_MSG_TOO_LONG;
}
if(is_number(argv[3]))
return_value = send(get_username().c_str(), argv[4], strtol100(argv[3]), base_amount, "silent");
else
return_value = send(get_username().c_str(), argv[3], strtol100(argv[4]), base_amount, "silent");
if(!return_value) //send was successful
{
if(is_number(argv[3]))
send_message(get_username().c_str(), argv[4], argv[5], strtol100(argv[3]), "silent");
else
send_message(get_username().c_str(), argv[3], argv[5], strtol100(argv[4]), "silent");
amount = strtol100(argv[3]);
receiver = argv[4];
}
else
{
amount = strtol100(argv[4]);
receiver = argv[3];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, argv[5], amount, "silent");
}
}
else if(argc < 4)
@ -1937,17 +1952,22 @@ int main(int argc, char *argv[])
else
{
int return_value;
long long int amount = 0;
char* receiver = NULL;
if(is_number(argv[2]))
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "verbose");
else
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "verbose");
if(!return_value) //send was successful
{
if(is_number(argv[2]))
send_message(get_username().c_str(), argv[3], "", strtol100(argv[2]), "verbose");
else
send_message(get_username().c_str(), argv[2], "", strtol100(argv[3]), "verbose");
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "verbose");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, "", amount, "verbose");
}
}
else if(!strcmp(argv[1], "silentsend") || !strcmp(argv[1], "-ss"))
@ -1955,19 +1975,29 @@ int main(int argc, char *argv[])
if(argc==4)
{
int return_value;
if(is_number(argv[3]))
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "silent");
long long int amount = 0;
char* receiver = NULL;
if(is_number(argv[2]))
{
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "silent");
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
if(is_number(argv[3]))
send_message(get_username().c_str(), argv[2], "", strtol100(argv[3]), "silent");
else
send_message(get_username().c_str(), argv[3], "", strtol100(argv[2]), "silent");
send_message(get_username().c_str(), receiver, "", amount, "silent");
}
if(argc==5) //custom message included
{
int return_value;
long long int amount = 0;
char* receiver = NULL;
return_value = message_is_long(argv[4]);
if(return_value) //message is too long
{
@ -1975,16 +2005,18 @@ int main(int argc, char *argv[])
return ERR_MAIN_MSG_TOO_LONG;
}
if(is_number(argv[2]))
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "silent");
else
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "silent");
if(!return_value) //send was successful
{
if(is_number(argv[2]))
send_message(get_username().c_str(), argv[3], argv[4], strtol100(argv[2]), "silent");
else
send_message(get_username().c_str(), argv[2], argv[4], strtol100(argv[3]), "silent");
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
send_message(get_username().c_str(), argv[3], argv[4], strtol100(argv[2]), "silent");
}
else
return ERR_SILENTSEND;

130
tcoin.cpp
View File

@ -1718,38 +1718,50 @@ int main(int argc, char *argv[])
if(!strcmp(argv[2], "-s")) //silent send with no message
{
int return_value;
long long int amount = 0;
char *receiver = NULL;
if(is_number(argv[3]))
return_value = send(get_username().c_str(), argv[4], strtol100(argv[3]), base_amount, "silent");
else
return_value = send(get_username().c_str(), argv[3], strtol100(argv[4]), base_amount, "silent");
if(!return_value) //send was successful
{
if(is_number(argv[3]))
send_message(get_username().c_str(), argv[4], "", strtol100(argv[3]), "silent");
else
send_message(get_username().c_str(), argv[3], "", strtol100(argv[4]), "silent");
amount = strtol100(argv[3]);
receiver = argv[4];
}
else
{
amount = strtol100(argv[4]);
receiver = argv[3];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, "", amount, "silent");
}
else //argument count is 5 because a custom message was included
{
int return_value;
long long int amount = 0;
char *receiver = NULL;
return_value = message_is_long(argv[4]);
if(return_value) //message is too long
{
std::cout << "\nSorry, the message was longer than " << TCOIN_MSG_LENGTH_LIMIT << " characters. Please keep messages at or below this limit.\n\n";
return ERR_MAIN_MSG_TOO_LONG;
}
if(is_number(argv[2]))
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "verbose");
else
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "verbose");
if(!return_value) //send was successful
{
if(is_number(argv[2]))
send_message(get_username().c_str(), argv[3], argv[4], strtol100(argv[2]), "verbose");
else
send_message(get_username().c_str(), argv[2], argv[4], strtol100(argv[3]), "verbose");
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "verbose");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, argv[4], amount, "verbose");
}
}
else if(argc == 6)
@ -1757,23 +1769,29 @@ int main(int argc, char *argv[])
if(!strcmp(argv[2], "-s"))
{ //argument count is 6 because of silent send with custom message included
int return_value;
long long int amount = 0;
char *receiver = NULL;
return_value = message_is_long(argv[5]);
if(return_value) //message is too long
{
std::cout << "\nSorry, the message was longer than " << TCOIN_MSG_LENGTH_LIMIT << " characters. Please keep messages at or below this limit.\n\n";
return ERR_MAIN_MSG_TOO_LONG;
}
if(is_number(argv[3]))
return_value = send(get_username().c_str(), argv[4], strtol100(argv[3]), base_amount, "silent");
else
return_value = send(get_username().c_str(), argv[3], strtol100(argv[4]), base_amount, "silent");
if(!return_value) //send was successful
{
if(is_number(argv[3]))
send_message(get_username().c_str(), argv[4], argv[5], strtol100(argv[3]), "silent");
else
send_message(get_username().c_str(), argv[3], argv[5], strtol100(argv[4]), "silent");
amount = strtol100(argv[3]);
receiver = argv[4];
}
else
{
amount = strtol100(argv[4]);
receiver = argv[3];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, argv[5], amount, "silent");
}
}
else if(argc < 4)
@ -1789,17 +1807,22 @@ int main(int argc, char *argv[])
else
{
int return_value;
long long int amount = 0;
char* receiver = NULL;
if(is_number(argv[2]))
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "verbose");
else
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "verbose");
if(!return_value) //send was successful
{
if(is_number(argv[2]))
send_message(get_username().c_str(), argv[3], "", strtol100(argv[2]), "verbose");
else
send_message(get_username().c_str(), argv[2], "", strtol100(argv[3]), "verbose");
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "verbose");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, "", amount, "verbose");
}
}
else if(!strcmp(argv[1], "silentsend") || !strcmp(argv[1], "-ss"))
@ -1807,38 +1830,49 @@ int main(int argc, char *argv[])
if(argc==4)
{
int return_value;
long long int amount = 0;
char* receiver = NULL;
if(is_number(argv[2]))
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "silent");
else
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "silent");
if(!return_value) //send was successful
{
if(is_number(argv[2]))
send_message(get_username().c_str(), argv[3], "", strtol100(argv[2]), "silent");
else
send_message(get_username().c_str(), argv[2], "", strtol100(argv[3]), "silent");
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, "", amount, "silent");
}
if(argc==5) //custom message included
{
int return_value;
long long int amount = 0;
char* receiver = NULL;
return_value = message_is_long(argv[4]);
if(return_value) //message is too long
{
std::cout << "\nSorry, the message was longer than " << TCOIN_MSG_LENGTH_LIMIT << " characters. Please keep messages at or below this limit.\n\n";
return ERR_MAIN_MSG_TOO_LONG;
}
if(is_number(argv[2]))
return_value = send(get_username().c_str(), argv[3], strtol100(argv[2]), base_amount, "silent");
else
return_value = send(get_username().c_str(), argv[2], strtol100(argv[3]), base_amount, "silent");
if(!return_value) //send was successful
{
if(is_number(argv[2]))
send_message(get_username().c_str(), argv[3], argv[4], strtol100(argv[2]), "silent");
else
send_message(get_username().c_str(), argv[2], argv[4], strtol100(argv[3]), "silent");
amount = strtol100(argv[2]);
receiver = argv[3];
}
else
{
amount = strtol100(argv[3]);
receiver = argv[2];
}
return_value = send(get_username().c_str(), receiver, amount, base_amount, "silent");
if(!return_value) //send was successful
send_message(get_username().c_str(), receiver, argv[4], amount, "silent");
}
else
return ERR_SILENTSEND;