The following changes since commit d091d099aa867596745f2fa0d58631a14a746520: Make the 'closest option' print a bit better (2010-04-01 19:56:23 +0200) are available in the git repository at: git://git.kernel.dk/fio.git master Jens Axboe (2): Make sure that alias names are also valid on the command line Fix spelling error fio.1 | 4 ++-- options.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) --- Diff of recent changes: diff --git a/fio.1 b/fio.1 index 12146c8..305c184 100644 --- a/fio.1 +++ b/fio.1 @@ -211,14 +211,14 @@ same size. .TP .BI blocksize \fR=\fPint[,int] "\fR,\fB bs" \fR=\fPint[,int] Block size for I/O units. Default: 4k. Values for reads and writes can be -specified seperately in the format \fIread\fR,\fIwrite\fR, either of +specified separately in the format \fIread\fR,\fIwrite\fR, either of which may be empty to leave that value at its default. .TP .BI blocksize_range \fR=\fPirange[,irange] "\fR,\fB bsrange" \fR=\fPirange[,irange] Specify a range of I/O block sizes. The issued I/O unit will always be a multiple of the minimum size, unless \fBblocksize_unaligned\fR is set. Applies to both reads and writes if only one range is given, but can be specified -seperately with a comma seperating the values. Example: bsrange=1k-4k,2k-8k. +separately with a comma seperating the values. Example: bsrange=1k-4k,2k-8k. Also (see \fBblocksize\fR). .TP .BI bssplit \fR=\fPstr diff --git a/options.c b/options.c index 994f2a1..2369191 100644 --- a/options.c +++ b/options.c @@ -1841,9 +1841,10 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, }; -static void add_to_lopt(struct option *lopt, struct fio_option *o) +static void add_to_lopt(struct option *lopt, struct fio_option *o, + const char *name) { - lopt->name = (char *) o->name; + lopt->name = (char *) name; lopt->val = FIO_GETOPT_JOB; if (o->type == FIO_OPT_STR_SET) lopt->has_arg = no_argument; @@ -1864,7 +1865,11 @@ void fio_options_dup_and_init(struct option *long_options) o = &options[0]; while (o->name) { - add_to_lopt(&long_options[i], o); + add_to_lopt(&long_options[i], o, o->name); + if (o->alias) { + i++; + add_to_lopt(&long_options[i], o, o->alias); + } i++; o++; -- To unsubscribe from this list: send the line "unsubscribe fio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html