similar to: [PATCH 1/2] mllib: add and use set_standard_options

Add a new Getopt module to mllib, to parse command line arguments with handlers close to the ones used with Arg, but using getopt(3) (actually getopt_long_only) to do the real parsing. This allow us to provide options for OCaml tools with a syntax similar to the C tools, and use the additional features getopt offers and Arg does not. Getopt now handles every part of the command line handling,

The Arg module of OCaml does not support hiding options from the --help output: hence, mark --short-options and --long-options as internal options, since we need them only for the bash completion scripts. --- mllib/common_utils.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 3d6eb94..db8a298 100644 ---

On Fri, Jun 24, 2016 at 05:42:37PM +0200, Pino Toscano wrote: > Add a new Getopt module to mllib, to parse command line arguments with > handlers close to the ones used with Arg, but using getopt(3) (actually > getopt_long_only) to do the real parsing. This allow us to provide > options for OCaml tools with a syntax similar to the C tools, and use > the additional features getopt

Add a new Getopt module to mllib, to parse command line arguments with handlers close to the ones used with Arg, but using getopt(3) (actually getopt_long_only) to do the real parsing. This allow us to provide options for OCaml tools with a syntax similar to the C tools, and use the additional features getopt offers and Arg does not. Do a single-step conversion of Common_utils and all the OCaml

Add a new Getopt module to mllib, to parse command line arguments with handlers close to the ones used with Arg, but using getopt(3) (actually getopt_long_only) to do the real parsing. This allow us to provide options for OCaml tools with a syntax similar to the C tools, and use the additional features getopt offers and Arg does not. Do a single-step conversion of Common_utils and all the OCaml

Move --debug-gc as common option for all the OCaml-based tools, even a couple of them which didn't have it previously. As implementation note, make set_debug_gc private to set_standard_options, as it needed to be moved otherwise, and it is no more required as public function. --- customize/customize_main.ml | 1 - mllib/common_utils.ml | 8 ++++---- mllib/common_utils.mli | 3 ---

Make print_version_and_exit, long_options, display_short_options, and display_long_options private, as set_standard_options now takes care of handling the job for the common command line options. --- mllib/common_utils.mli | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli index 79032bc..24f8f83 100644 --- a/mllib/common_utils.mli +++

--- builder/cmdline.ml | 61 +++++++-------- dib/cmdline.ml | 57 +++++++------- generator/customize.ml | 29 +++---- get-kernel/get_kernel.ml | 17 +++-- mllib/common_utils.ml | 15 ++-- mllib/getopt.ml | 121 +++++++++++++++--------------- mllib/getopt.mli

Extract the guest kernel/ramdisk extraction from virt-builder into a separate utility, so it can be used and improved without cluttering virt-builder. Currently it does what virt-builder --get-kernel did, adding also the options for remote disks and libvirt access, much like other libguestfs tools. virt-builder --get-kernel now just spawns virt-get-kernel. --- .gitignore |

Simple refactoring, no actual behaviour changes. --- get-kernel/get_kernel.ml | 188 ++++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 93 deletions(-) diff --git a/get-kernel/get_kernel.ml b/get-kernel/get_kernel.ml index 8ca7ca0..3b27740 100644 --- a/get-kernel/get_kernel.ml +++ b/get-kernel/get_kernel.ml @@ -23,104 +23,106 @@ module G = Guestfs open Printf

The second patch is obviously not complete yet - for discussion only. Rich.

Several tools handle --debug-gc command-line option, by explicitly forcing GC on every exit path. This is tedious and prone to forgetting some of the exit paths. Instead, add a generic handler for --debug-gc, which installs an at_exit hook to do the GC consistency check, and which can be called right in the command-line parser. Also adjust all users of --debug-gc to use that handler.

New --prefix option to specify a prefix for the extracted file names. --- get-kernel/get_kernel.ml | 21 ++++++++++++++++----- get-kernel/virt-get-kernel.pod | 13 +++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/get-kernel/get_kernel.ml b/get-kernel/get_kernel.ml index 1523363..01297f0 100644 --- a/get-kernel/get_kernel.ml +++ b/get-kernel/get_kernel.ml @@

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

Don't pass these flags to dozens of functions. --- builder/builder.ml | 47 +++++++++-------- builder/cache.ml | 4 +- builder/cache.mli | 2 +- builder/cmdline.ml | 13 ++--- builder/downloader.ml | 14 +++-- builder/downloader.mli

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

On Mon, Aug 31, 2015 at 06:49:55PM +0200, Pino Toscano wrote: > Move --debug-gc as common option for all the OCaml-based tools, even a > couple of them which didn't have it previously. > > As implementation note, make set_debug_gc private to > set_standard_options, as it needed to be moved otherwise, and it is no > more required as public function. ACK series. I guess

Store the machine-readable flag globally, just like done for verbose/debug/etc, and enhance create_standard_options to provide --machine-readable automatically. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 7 +++++-- common/mltools/tools_utils.ml | 7 ++++++- common/mltools/tools_utils.mli | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff

Add a no-op --no-selinux-relabel option, to be compatible with virt-sysprep < 1.26. --- sysprep/main.ml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysprep/main.ml b/sysprep/main.ml index ea94728..f32c4ad 100644 --- a/sysprep/main.ml +++ b/sysprep/main.ml @@ -140,6 +140,8 @@ let main () = "--list-operations", Arg.Unit list_operations, " " ^ s_"List