shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Fix command line option decoding

Browse Source 
LVM has huge set of options now - it's approaching 60 short-arg less options
and we get interesting case of misdetection for 'merge' option which has been
put into the middle of options with 'short_arg' - thus certainly past 65. (ASCII 'A').

To avoid confusion of short_arg with long_opt number - add  '128' to all such
non-short-arg options.
This commit is contained in:
Zdenek Kabelac 2011-09-16 12:10:02 +00:00
parent b91e3e9083
commit bf93b4ddfe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.89 -
==================================
Fix command line option decoding.
Reset LV status when unlinking LV from VG.
Fix overly strict extent-count divisibility requirements for striped mirrors.
Fix rounding direction in lvresize when reducing volume size.

4
tools/lvmcmdline.c
View File

@ -641,7 +641,7 @@ static void _add_getopt_arg(int arg, char **ptr, struct option **o)
if (a->short_arg)
(*o)->val = a->short_arg;
else
(*o)->val = arg;
(*o)->val = arg + 128;
(*o)++;
}
#endif
@ -662,7 +662,7 @@ static int _find_arg(struct command *com, int opt)
* the_args.
*/
if ((a->short_arg && (opt == a->short_arg)) ||
(!a->short_arg && (opt == arg)))
(!a->short_arg && (opt == (arg + 128))))
return arg;
}