search for: f312bde41

Changes from v1 to v2: - split the "simple unquoting" as helper - pass the unquoting function to split_key_value_strings - use right unquoting function when applying split_key_value_strings Pino Toscano (2): daemon: add split_key_value_strings helper daemon: use split_key_value_strings daemon/inspect_fs_unix.ml | 93 +++++++++++++++++++---------------------------- daemon/md.ml

...+ let lines = List.filter (fun s -> s.[0] <> '#') lines in + let lines = List.map (String.split "=") lines in + match unquote with + | None -> lines + | Some f -> List.map (fun (k, v) -> (k, f v)) lines diff --git a/daemon/utils.mli b/daemon/utils.mli index f312bde41..c44a6dc76 100644 --- a/daemon/utils.mli +++ b/daemon/utils.mli @@ -97,5 +97,16 @@ val unix_canonical_path : string -> string The path is modified in place because the result is always the same length or shorter than the argument passed. *) +val simple_unquote : string -> string +...

...un s -> s.[0] <> '#') lines in > + let lines = List.map (String.split "=") lines in > + match unquote with > + | None -> lines > + | Some f -> List.map (fun (k, v) -> (k, f v)) lines > diff --git a/daemon/utils.mli b/daemon/utils.mli > index f312bde41..c44a6dc76 100644 > --- a/daemon/utils.mli > +++ b/daemon/utils.mli > @@ -97,5 +97,16 @@ val unix_canonical_path : string -> string > The path is modified in place because the result is always > the same length or shorter than the argument passed. *) > > +val sim...

Changes from v2 to v3: - split_key_value_strings renamed to parse_key_value_strings Changes from v1 to v2: - split the "simple unquoting" as helper - pass the unquoting function to split_key_value_strings - use right unquoting function when applying split_key_value_strings Pino Toscano (2): daemon: add split_key_value_strings helper daemon: use parse_key_value_strings

...let n = String.length value in + if n >= 2 && value.[0] = '"' && value.[n-1] = '"' then + String.sub value 1 (n-2) + else + value in + (key, value) + ) lines diff --git a/daemon/utils.mli b/daemon/utils.mli index f312bde41..9730d06b5 100644 --- a/daemon/utils.mli +++ b/daemon/utils.mli @@ -97,5 +97,11 @@ val unix_canonical_path : string -> string The path is modified in place because the result is always the same length or shorter than the argument passed. *) +val split_key_value_strings : string list...

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way