From f57a9c59e366aa2f0621aa260bfd5ef5aeb61643 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 9 Sep 2011 21:01:37 +0200
Subject: [PATCH] Add terse version output format command line parameter

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---
 README |  1 +
 fio.1  |  3 +++
 fio.h  |  1 +
 init.c | 15 +++++++++++++++
 4 files changed, 20 insertions(+)

diff --git a/README b/README
index 7c93d1fc..ede4c814 100644
--- a/README
+++ b/README
@@ -134,6 +134,7 @@ $ fio
 	--bandwidth-log	Generate per-job bandwidth logs
 	--minimal		Minimal (terse) output
 	--version		Print version info and exit
+	--terse-version=type	Terse version output format
 	--help			Print this page
 	--cmdhelp=cmd	Print command help, "all" for all of them
 	--showcmd		Turn a job file into command line options
diff --git a/fio.1 b/fio.1
index ffc97c98..7eb20498 100644
--- a/fio.1
+++ b/fio.1
@@ -53,6 +53,9 @@ Display usage information and exit.
 .TP
 .B \-\-version
 Display version information and exit.
+.TP
+.B \-\-terse\-version\fR=\fPtype
+Terse version output format
 .SH "JOB FILE FORMAT"
 Job files are in `ini' format. They consist of one or more
 job definitions, which begin with a job name in square brackets and
diff --git a/fio.h b/fio.h
index 6eb270d2..e93e8f3d 100644
--- a/fio.h
+++ b/fio.h
@@ -648,6 +648,7 @@ extern int fio_gtod_offload;
 extern int fio_gtod_cpu;
 extern enum fio_cs fio_clock_source;
 extern int warnings_fatal;
+extern int terse_version;
 
 extern struct thread_data *threads;
 
diff --git a/init.c b/init.c
index ed342693..f55e5d71 100644
--- a/init.c
+++ b/init.c
@@ -43,6 +43,7 @@ char **job_sections = NULL;
 int nr_job_sections = 0;
 char *exec_profile = NULL;
 int warnings_fatal = 0;
+int terse_version = 2;
 
 int write_bw_log = 0;
 int read_only = 0;
@@ -147,6 +148,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
 		.has_arg	= required_argument,
 		.val		= 'j',
 	},
+	{
+		.name		= (char *) "terse-version",
+		.has_arg	= required_argument,
+		.val		= 'V',
+	},
 	{
 		.name		= NULL,
 	},
@@ -1038,6 +1044,7 @@ static void usage(const char *name)
 	printf("\t--bandwidth-log\tGenerate per-job bandwidth logs\n");
 	printf("\t--minimal\tMinimal (terse) output\n");
 	printf("\t--version\tPrint version info and exit\n");
+	printf("\t--terse-version=x Terse version output format\n");
 	printf("\t--help\t\tPrint this page\n");
 	printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of"
 		" them\n");
@@ -1199,6 +1206,14 @@ static int parse_cmd_line(int argc, char *argv[])
 		case 'v':
 			log_info("%s\n", fio_version_string);
 			exit(0);
+		case 'V':
+			terse_version = atoi(optarg);
+			if (terse_version != 2) {
+				log_err("fio: bad terse version format\n");
+				exit_val = 1;
+				do_exit++;
+			}
+			break;
 		case 'e':
 			if (!strcmp("always", optarg))
 				eta_print = FIO_ETA_ALWAYS;
-- 
2.25.1