daemon: Reimplement ‘realpath’ API in OCaml.

daemon/Makefile.am

@@ -140,7 +140,6 @@ guestfsd_SOURCES = \
 	pingdaemon.c \
 	proto.c \
 	readdir.c \
-	realpath.c \
 	rename.c \
 	rsync.c \
 	scrub.c \

daemon/realpath.c

@@ -1,50 +0,0 @@
-/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2017 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <dirent.h>
-
-#include "cloexec.h"
-
-#include "daemon.h"
-#include "optgroups.h"
-#include "actions.h"
-
-char *
-do_realpath (const char *path)
-{
-  char *ret;
-
-  CHROOT_IN;
-  ret = realpath (path, NULL);
-  CHROOT_OUT;
-  if (ret == NULL) {
-    reply_with_perror ("%s", path);
-    return NULL;
-  }
-
-  return ret;			/* caller frees */
-}

daemon/realpath.ml

@@ -20,6 +20,10 @@ open Printf
 
 open Std_utils
 
+let realpath path =
+  let chroot = Chroot.create ~name:(sprintf "realpath: %s" path) () in
+  Chroot.f chroot Unix_utils.Realpath.realpath path
+
 (* The infamous case_sensitive_path function, which works around
  * the bug in ntfs-3g that all paths are case sensitive even though
  * the underlying filesystem is case insensitive.

daemon/realpath.mli

@@ -16,4 +16,5 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *)
 
+val realpath : string -> string
 val case_sensitive_path : string -> string

docs/C_SOURCE_FILES

@@ -147,7 +147,6 @@ daemon/parted.c
 daemon/pingdaemon.c
 daemon/proto.c
 daemon/readdir.c
-daemon/realpath.c
 daemon/rename.c
 daemon/rsync.c
 daemon/scrub.c

generator/actions_core.ml

@@ -4197,6 +4197,7 @@ compress- or gzip-compressed.
   { defaults with
     name = "realpath"; added = (1, 0, 66);
     style = RString (RPlainString, "rpath"), [String (Pathname, "path")], [];
+    impl = OCaml "Realpath.realpath";
     tests = [
       InitISOFS, Always, TestResultString (
         [["realpath"; "/../directory"]], "/directory"), []