search for: f1f06cc

...Bool_val (verbosev)); if (r == -1) - guestfs_int_ocaml_raise_error (g, "edit_file_perl"); + caml_failwith (guestfs_last_error (g) ? : "edit_file_perl: unknown error"); CAMLreturn (Val_unit); } diff --git a/customize/perl_edit.ml b/customize/perl_edit.ml index f1f06cc..992a001 100644 --- a/customize/perl_edit.ml +++ b/customize/perl_edit.ml @@ -18,6 +18,7 @@ open Common_utils -external c_edit_file : verbose:bool -> Guestfs.t -> string -> string -> unit +external c_edit_file : verbose:bool -> int64 -> string -> string -> unit = &qu...

...Bool_val (verbosev)); if (r == -1) - guestfs_int_ocaml_raise_error (g, "edit_file_perl"); + caml_failwith (guestfs_last_error (g) ? : "edit_file_perl: unknown error"); CAMLreturn (Val_unit); } diff --git a/customize/perl_edit.ml b/customize/perl_edit.ml index f1f06cc..5cd250b 100644 --- a/customize/perl_edit.ml +++ b/customize/perl_edit.ml @@ -18,6 +18,12 @@ open Common_utils -external c_edit_file : verbose:bool -> Guestfs.t -> string -> string -> unit +external c_edit_file : verbose:bool -> Guestfs.t -> int64 -> string -> string -&...

In v1 of this patch, there was the (small) possibility that 'g' might have been garbage collected while we were in the C function. Avoid this by passing 'g' to the function as well as the C pointer, so that 'g' is pinned as a garbage collector root [by CAMLparam5] so it cannot be collected while we're in the function. Rich.

...d up. *) -val run : verbose:bool -> quiet:bool -> Guestfs.guestfs -> string -> Customize_cmdline.ops -> unit +val run : quiet:bool -> Guestfs.guestfs -> string -> Customize_cmdline.ops -> unit diff --git a/customize/perl_edit.ml b/customize/perl_edit.ml index 96c4062..f1f06cc 100644 --- a/customize/perl_edit.ml +++ b/customize/perl_edit.ml @@ -16,5 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -external edit_file : verbose:bool -> Guestfs.t -> string -> string -> unit +open Common_utils + +external c_edit_file : verbose:bool...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623