lib/file: FileIO_CloseAndUnlink

Unlink regardless of the close status.

diff --git a/open-vm-tools/lib/file/fileIO.c b/open-vm-tools/lib/file/fileIO.c
index 77ffc0127c6a41a84e95c1c241e83a543a481c9f..2eaf36a7ea4bed89c8675f1bbd830541b8c0eae5 100644 (file)
--- a/open-vm-tools/lib/file/fileIO.c
+++ b/open-vm-tools/lib/file/fileIO.c
@@ -524,10 +524,8 @@ FileIO_CloseAndUnlink(FileIODescriptor *fd)  // IN:
    path = Unicode_Duplicate(fd->fileName);
 
    ret = FileIO_Close(fd);
-   if (FileIO_IsSuccess(ret)) {
-      if (File_UnlinkIfExists(path) == -1) {
-         ret = FILEIO_ERROR;
-      }
+   if ((File_UnlinkIfExists(path) == -1) && FileIO_IsSuccess(ret)) {
+      ret = FILEIO_ERROR;
    }
 
    Posix_Free(path);