GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-30 08:24:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cgminer' of git://github.com/ckolivas/cgminer into cgminer

Browse Source
This commit is contained in:
Ycros 2011-07-05 17:03:28 +10:00
commit 1f809987fa
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.c
View File

@ -194,7 +194,7 @@ static struct option_help options_help[] = {
"(-g N) Number of threads per-GPU (0 - 10, default: 2)" }, "(-g N) Number of threads per-GPU (0 - 10, default: 2)" },
{ "intensity N", { "intensity N",
"(-I) Intensity of scanning (0 - 14, default 4)" }, "(-I N) Intensity of GPU scanning (0 - 14, default 4)" },
{ "log N", { "log N",
"(-l N) Interval in seconds between log output (default: 5)" }, "(-l N) Interval in seconds between log output (default: 5)" },
@ -236,11 +236,11 @@ static struct option_help options_help[] = {
#endif #endif
{ "url URL", { "url URL",
"URL for bitcoin JSON-RPC server " "(-o URL) URL for bitcoin JSON-RPC server "
"(default: " DEF_RPC_URL ")" }, "(default: " DEF_RPC_URL ")" },
{ "userpass USERNAME:PASSWORD", { "userpass USERNAME:PASSWORD",
"Username:Password pair for bitcoin JSON-RPC server " "(-O USERNAME:PASSWORD) Username:Password pair for bitcoin JSON-RPC server "
"(default: " DEF_RPC_USERPASS ")" }, "(default: " DEF_RPC_USERPASS ")" },
{ "user USERNAME", { "user USERNAME",
@ -276,11 +276,12 @@ static struct option options[] = {
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
{ "syslog", 0, NULL, 1004 }, { "syslog", 0, NULL, 1004 },
#endif #endif
{ "url", 1, NULL, 1001 }, { "url", 1, NULL, 'o' },
{ "user", 1, NULL, 'u' }, { "user", 1, NULL, 'u' },
{ "vectors", 1, NULL, 'v' }, { "vectors", 1, NULL, 'v' },
{ "worksize", 1, NULL, 'w' }, { "worksize", 1, NULL, 'w' },
{ "userpass", 1, NULL, 1002 }, { "userpass", 1, NULL, 'O' },
{0, 0, 0, 0}
}; };
static bool jobj_binary(const json_t *obj, const char *key, static bool jobj_binary(const json_t *obj, const char *key,
@ -1393,7 +1394,7 @@ static void parse_arg (int key, char *arg)
opt_worksize = v; opt_worksize = v;
break; break;
case 1001: /* --url */ case 'o': /* --url */
if (strncmp(arg, "http://", 7) && if (strncmp(arg, "http://", 7) &&
strncmp(arg, "https://", 8)) strncmp(arg, "https://", 8))
show_usage(); show_usage();
@ -1401,7 +1402,7 @@ static void parse_arg (int key, char *arg)
free(rpc_url); free(rpc_url);
rpc_url = strdup(arg); rpc_url = strdup(arg);
break; break;
case 1002: /* --userpass */ case 'O': /* --userpass */
if (!strchr(arg, ':')) if (!strchr(arg, ':'))
show_usage(); show_usage();
@ -1414,6 +1415,7 @@ static void parse_arg (int key, char *arg)
case 1004: case 1004:
use_syslog = true; use_syslog = true;
break; break;
case '?':
default: default:
show_usage(); show_usage();
} }
@ -1456,7 +1458,7 @@ static void parse_cmdline(int argc, char *argv[])
int key; int key;
while (1) { while (1) {
key = getopt_long(argc, argv, "a:c:qDPr:s:t:h?", options, NULL); key = getopt_long(argc, argv, "a:c:Dg:I:l:no:O:p:PQ:qr:R:s:t:u:v:w:h?", options, NULL);
if (key < 0) if (key < 0)
break; break;