X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=a4f641a293fb0bcce1e9793f5ff20663bc7c0860;hp=624814ade9eae5ba55dcf493d2914005cb7e0222;hb=34403fb14ba48d708fdfd2934583506bb5caac05;hpb=7b395ca5d5f38d50f0c9d4c11fb2b51760caf119

diff --git a/init.c b/init.c
index 624814ad..a4f641a2 100644
--- a/init.c
+++ b/init.c
@@ -395,7 +395,7 @@ static struct fio_option options[] = {
 		.name	= "thinktime_spin",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(thinktime_spin),
-		.help	= "Start thinktime by spinning this amount (usec)",
+		.help	= "Start think time by spinning this amount (usec)",
 		.def	= "0",
 	},
 	{
@@ -581,7 +581,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 	},
 	{
 		.name		= "cmdhelp",
-		.has_arg	= required_argument,
+		.has_arg	= optional_argument,
 		.val		= 'c',
 	},
 	{
@@ -608,6 +608,16 @@ FILE *f_err = NULL;
 static int write_lat_log = 0;
 int write_bw_log = 0;
 
+FILE *get_f_out()
+{
+	return f_out;
+}
+
+FILE *get_f_err()
+{
+	return f_err;
+}
+
 /*
  * Return a free job structure.
  */
@@ -1213,7 +1223,7 @@ static int parse_cmd_line(int argc, char *argv[])
 	struct thread_data *td = NULL;
 	int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
 
-	while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) {
+	while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
 		switch (c) {
 		case 't':
 			def_timeout = atoi(optarg);