[Libguestfs] [PATCH libguestfs 18/23] generator.ml: constify do_mkdtemp

[Richard W.M. Jones]

On Wed, Aug 12, 2009 at 06:52:54PM +0200, Jim Meyering wrote:
> From: Jim Meyering <meyering at redhat.com>
> 
> * daemon/dir.c (do_mkdtemp): Rewrite for a "const" parameter.
> * src/generator.ml (mkdtemp): Declare parameter to be of type Pathname.
> ---
>  daemon/dir.c     |   25 ++++++++-----------------
>  src/generator.ml |    6 ++----
>  2 files changed, 10 insertions(+), 21 deletions(-)
> 
> diff --git a/daemon/dir.c b/daemon/dir.c
> index ad1c7c9..1ca6286 100644
> --- a/daemon/dir.c
> +++ b/daemon/dir.c
> @@ -185,31 +185,22 @@ do_is_dir (const char *path)
>  }
> 
>  char *
> -do_mkdtemp (char *template)
> +do_mkdtemp (const char *template)
>  {
> -  char *r;
> -
> -  NEED_ROOT (return NULL);
> -  ABS_PATH (template, return NULL);
> +  char *writable = strdup (template);
> +  if (writable == NULL) {
> +    reply_with_perror ("strdup");
> +    return NULL;
> +  }
> 
>    CHROOT_IN;
> -  r = mkdtemp (template);
> +  char *r = mkdtemp (writable);
>    CHROOT_OUT;
> 
>    if (r == NULL) {
>      reply_with_perror ("mkdtemp: %s", template);
> -    return NULL;
> +    free (writable);
>    }
> 
> -  /* The caller will free template AND try to free the return value,
> -   * so we must make a copy here.
> -   */
> -  if (r == template) {
> -    r = strdup (template);
> -    if (r == NULL) {
> -      reply_with_perror ("strdup");
> -      return NULL;
> -    }
> -  }
>    return r;
>  }
> diff --git a/src/generator.ml b/src/generator.ml
> index 8aa36bd..ddeeb25 100755
> --- a/src/generator.ml
> +++ b/src/generator.ml
> @@ -2594,8 +2594,7 @@ containing C<dir>.
>  It is an interface to the L<scrub(1)> program.  See that
>  manual page for more details.");
> 
> -(* FIXME: make this a WritableString? *)
> -  ("mkdtemp", (RString "dir", [String "template"]), 117, [],
> +  ("mkdtemp", (RString "dir", [Pathname "template"]), 117, [],
>     [InitBasicFS, Always, TestRun (
>        [["mkdir"; "/tmp"];
>         ["mkdtemp"; "/tmp/tmpXXXXXX"]])],
> @@ -4717,7 +4716,7 @@ and generate_daemon_actions () =
>               | Pathname n ->
>                   pr "  char *%s = args.%s;\n" n n;
>                   pr "  ABS_PATH (%s, goto done);\n" n;
> -	     | Device n ->
> +             | Device n ->
>                   pr "  char *%s = args.%s;\n" n n;
>                   pr "  RESOLVE_DEVICE (%s, goto done);" n;
>               | String n -> pr "  char *%s = args.%s;\n" n n
> @@ -6798,7 +6797,6 @@ DESTROY (g)
>        iteri (
>          fun i ->
>            function
> -	  (* FIXME: ? *)
>            | Pathname n | Device n | String n | FileIn n | FileOut n ->
>                pr "      char *%s;\n" n
>            | OptString n ->
> -- 
> 1.6.4.337.g5420e

Discussed on IRC already, ACK.

Rich.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/