From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 10 Apr 2019 21:14:51 +0000 (-0700)
Subject: Backing out the previous change to vixTools.c
X-Git-Tag: stable-11.0.0~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3de5e45099ae309b59f371e1d71c88c80815f92d;p=thirdparty%2Fopen-vm-tools.git

Backing out the previous change to vixTools.c

As the code committed was not the one reviewed but another version of the
fix under exploration, reverting the previous change.
---

diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 89947da3f..15b0a8bdf 100644
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -4980,11 +4980,7 @@ VixToolsInitiateFileTransferToGuest(VixCommandRequestHeader *requestMsg)  // IN
       goto abort;
    }
 
-#ifdef _WIN32
    File_GetPathName(guestPathName, &dirName, &baseName);
-#else
-   File_SplitName(guestPathName, NULL, &dirName, &baseName);
-#endif
    if ((NULL == dirName) || (NULL == baseName)) {
       g_debug("%s: File_GetPathName failed for '%s', dirName='%s', "
               "baseName='%s'.\n", __FUNCTION__, guestPathName,
@@ -4994,19 +4990,6 @@ VixToolsInitiateFileTransferToGuest(VixCommandRequestHeader *requestMsg)  // IN
       goto abort;
    }
 
-/*
-#ifndef _WIN32
-   if ('\0' == *dirName && '/' == *guestPathName) {
-      *
-       * dirName is empty and represents root directory
-       * For *nix like paths, changing dirName to '/'
-       *
-      free(dirName);
-      dirName = Util_SafeStrdup("/");
-   }
-#endif
-*/
-
    if (!File_IsDirectory(dirName)) {
 #ifdef _WIN32
       DWORD sysErr = GetLastError();