From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 23 Oct 2017 21:21:21 +0000 (-0700)
Subject: Revert - HostDiskMacos: Migrate macOS host disk functions from file and user to hostDisk.
X-Git-Tag: stable-10.3.0~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60179f0b8a4faaa66b490ba7b3f927664e634d6f;p=thirdparty%2Fopen-vm-tools.git

Revert - HostDiskMacos: Migrate macOS host disk functions from file and user to hostDisk.
---

diff --git a/open-vm-tools/lib/include/file.h b/open-vm-tools/lib/include/file.h
index 7cf44eea0..1d2a8c0ff 100644
--- a/open-vm-tools/lib/include/file.h
+++ b/open-vm-tools/lib/include/file.h
@@ -87,7 +87,28 @@ typedef char *File_MakeTempCreateNameFunc(uint32 num,
                                           void *data);
 
 #if defined(__APPLE__)
+typedef enum {
+   FILEMACOS_UNMOUNT_SUCCESS,
+   FILEMACOS_UNMOUNT_SUCCESS_ALREADY,
+   FILEMACOS_UNMOUNT_ERROR,
+} FileMacosUnmountStatus;
+
+FileMacosUnmountStatus FileMacos_UnmountDev(char const *bsdDev,
+                                            Bool wholeDev,
+                                            Bool eject,
+                                            Bool su);
+
+void FileMacos_MountDevAsyncNoResult(char const *bsdDev,
+                                     Bool su);
+
 Bool FileMacos_IsOnSparseDmg(int fd);
+Bool FileMacos_IsSliceDevice(char const *bsdDev);
+
+char *FileMacos_DiskDevToUserFriendlyName(char const *bsdDiskDev);
+char *FileMacos_DiskDevToVolumeName(char const *bsdDiskDev);
+
+char *FileMacos_DiskDeviceToUniqueID(char const *bsdPath);
+char *FileMacos_UniqueIDToDiskDevice(char const *identifier);
 Bool FileMacOS_MakeSecureLibraryCopies(const char   *inDir,
                                        const char  **dylibName,
                                        unsigned      numDylibs,