Commit 9d60b107f16a13aaffd7e5efaa28d57feba5df3a
2011-07-21T13:08:36
Abstract out a curses input function and separate input pool function to allow for live adding of pools later.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125
diff --git a/main.c b/main.c
index 06fcf74..fb89201 100644
--- a/main.c
+++ b/main.c
@@ -2555,6 +2555,47 @@ static void quit(int status, const char *format, ...)
exit(status);
}
+static char *curses_input(const char *query)
+{
+ char *input;
+
+ input = malloc(255);
+ if (!input)
+ quit(1, "Failed to malloc input");
+ leaveok(logwin, false);
+ wprintw(logwin, "%s: ", query);
+ wrefresh(logwin);
+ wgetnstr(logwin, input, 255);
+ leaveok(logwin, true);
+ return input;
+}
+
+static void input_pool(void)
+{
+ char *url, *user, *pass, *seterr;
+
+ immedok(logwin, true);
+ wprintw(logwin, "Input server details.\n");
+
+ url = curses_input("URL");
+ seterr = set_url(url, NULL);
+ if (seterr)
+ quit(1, "%s", seterr);
+
+ user = curses_input("Username");
+ seterr = set_user(user, NULL);
+ if (seterr)
+ quit(1, "%s", seterr);
+
+ pass = curses_input("Password");
+ seterr = set_pass(pass, NULL);
+ if (seterr)
+ quit(1, "%s", seterr);
+
+ wclear(logwin);
+ immedok(logwin, false);
+}
+
int main (int argc, char *argv[])
{
unsigned int i, j = 0, x, y, pools_active = 0;
@@ -2625,6 +2666,8 @@ int main (int argc, char *argv[])
opt_register_table(opt_cmdline_table,
"Options for command line only");
+ if (argc == 1)
+ quit(1, "No arguments specified");
opt_parse(&argc, argv, applog_and_exit);
if (argc != 1)
quit(1, "Unexpected extra commandline arguments");
@@ -2649,7 +2692,6 @@ int main (int argc, char *argv[])
}
logcursor = 7;
- mining_threads = opt_n_threads + gpu_threads;
gpucursor = logcursor;
cpucursor = gpucursor + nDevs;
logstart = cpucursor + (opt_n_threads ? num_processors : 0) + 1;
@@ -2669,44 +2711,9 @@ int main (int argc, char *argv[])
}
if (!total_pools) {
- if (curses_active) {
- char *input, *seterr;
-
- immedok(logwin, true);
- leaveok(logwin, false);
- wprintw(logwin, "No server specified on command line. Enter details manually\n");
-
- input = malloc(255);
- if (!input)
- quit(1, "Failed to malloc input");
- wprintw(logwin, "URL: ");
- wgetnstr(logwin, input, 255);
- seterr = set_url(input, NULL);
- if (seterr)
- quit(1, "%s", seterr);
-
- input = malloc(255);
- if (!input)
- quit(1, "Failed to malloc input");
- wprintw(logwin, "Username: ");
- wgetnstr(logwin, input, 255);
- seterr = set_user(input, NULL);
- if (seterr)
- quit(1, "%s", seterr);
-
- input = malloc(255);
- if (!input)
- quit(1, "Failed to malloc input");
- wprintw(logwin, "Password: ");
- wgetnstr(logwin, input, 255);
- seterr = set_pass(input, NULL);
- if (seterr)
- quit(1, "%s", seterr);
-
- wclear(logwin);
- leaveok(logwin, true);
- immedok(logwin, false);
- } else
+ if (curses_active)
+ input_pool();
+ else
quit(1, "No server specified");
}
@@ -2738,6 +2745,7 @@ int main (int argc, char *argv[])
openlog("cpuminer", LOG_PID, LOG_USER);
#endif
+ mining_threads = opt_n_threads + gpu_threads;
work_restart = calloc(mining_threads + 4, sizeof(*work_restart));
if (!work_restart)
quit(1, "Failed to calloc work_restart");