[Libguestfs] [PATCH v6 37/41] daemon: Reimplement ‘realpath’ API in OCaml.

Richard W.M. Jones
Thu, 15 Jun 2017 17:06:27 -0000

---
 daemon/Makefile.am        |  1 -
 daemon/realpath.c         | 50 -----------------------------------------------
 daemon/realpath.ml        |  5 +++++
 daemon/realpath.mli       |  1 +
 docs/C_SOURCE_FILES       |  1 -
 generator/actions_core.ml |  1 +
 6 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 15b78d6d8..db61b4f0d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -153,7 +153,6 @@ guestfsd_SOURCES = \
 	pingdaemon.c \
 	proto.c \
 	readdir.c \
-	realpath.c \
 	rename.c \
 	rsync.c \
 	scrub.c \
diff --git a/daemon/realpath.c b/daemon/realpath.c
deleted file mode 100644
index f9d22d28d..000000000
--- a/daemon/realpath.c
+++ /dev/null
@@ -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 */
-}
diff --git a/daemon/realpath.ml b/daemon/realpath.ml
index cffe86322..4b4971dd7 100644
--- a/daemon/realpath.ml
+++ b/daemon/realpath.ml
@@ -20,6 +20,11 @@ open Printf

 open Std_utils

+let realpath path +  let chroot = Chroot.create ~name:(sprintf "realpath:
%s" path)
+                             (Sysroot.sysroot ()) 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.
diff --git a/daemon/realpath.mli b/daemon/realpath.mli
index 371e619fc..3da53c461 100644
--- a/daemon/realpath.mli
+++ b/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
diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
index 651d294c5..02adbf73a 100644
--- a/docs/C_SOURCE_FILES
+++ b/docs/C_SOURCE_FILES
@@ -146,7 +146,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
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
index 070a1c641..4ec83d22d 100644
--- a/generator/actions_core.ml
+++ b/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"), []
--
2.13.0