Remove GetLStat

andyleejordan · andyleejordan · commit 1d240ef3e472 · 2016-10-14T15:42:59.000-07:00
diff --git a/src/libpsl-native/src/CMakeLists.txt b/src/libpsl-native/src/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_library(psl-native SHARED
   getstat.cpp
-  getlstat.cpp
   getpwuid.cpp
   getuserfrompid.cpp
   getfileowner.cpp
diff --git a/src/libpsl-native/src/getlstat.cpp b/src/libpsl-native/src/getlstat.cpp
diff --git a/src/libpsl-native/src/getlstat.h b/src/libpsl-native/src/getlstat.h
diff --git a/src/libpsl-native/src/isfile.cpp b/src/libpsl-native/src/isfile.cpp
@@ -2,10 +2,9 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief returns if the path exists
 
-#include "getlstat.h"
 #include "isfile.h"
 
-#include <errno.h>
+#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pwd.h>
@@ -24,21 +23,12 @@
 //! char* is marshaled as an LPStr, which on Linux is UTF-8.
 //! @endparblock
 //!
-//! @exception errno Passes this error via errno to GetLastError:
-//! - ERROR_INVALID_PARAMETER: parameter is not valid
-//!
 //! @retval true if path exists, false otherwise
 //!
 bool IsFile(const char* path)
 {
-    errno = 0;
-
-    if (!path)
-    {
-        errno = ERROR_INVALID_PARAMETER;
-        return false;
-    }
+    assert(path);
 
     struct stat buf;
-    return GetLStat(path, &buf) == 0;
+    return lstat(path, &buf) == 0;
 }
diff --git a/src/libpsl-native/src/issymlink.cpp b/src/libpsl-native/src/issymlink.cpp
@@ -2,10 +2,9 @@
 //! @author George FLeming <v-geflem@microsoft.com>
 //! @brief returns whether a path is a symbolic link
 
-#include "getlstat.h"
 #include "issymlink.h"
 
-#include <errno.h>
+#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -22,36 +21,15 @@
 //! char* is marshaled as an LPStr, which on Linux is UTF-8.
 //! @endparblock
 //!
-//! @exception errno Passes these errors via errno to GetLastError:
-//! - ERROR_INVALID_PARAMETER: parameter is not valid
-//! - ERROR_FILE_NOT_FOUND: file does not exist
-//! - ERROR_ACCESS_DENIED: access is denied
-//! - ERROR_FILE_NOT_FOUND: the system cannot find the file specified
-//! - ERROR_INVALID_ADDRESS: attempt to access invalid address
-//! - ERROR_STOPPED_ON_SYMLINK: the operation stopped after reaching a symbolic link
-//! - ERROR_GEN_FAILURE: device attached to the system is not functioning
-//! - ERROR_NO_SUCH_USER: there was no corresponding entry in the utmp-file
-//! - ERROR_INVALID_NAME: filename, directory name, or volume label syntax is incorrect
-//! - ERROR_BUFFER_OVERFLOW:  file name is too long
-//! - ERROR_INVALID_FUNCTION: incorrect function
-//! - ERROR_BAD_PATH_NAME: pathname is too long, or contains invalid characters
-//!
 //! @retval true if path is a symbolic link, false otherwise
 //!
 
 bool IsSymLink(const char* path)
 {
-    errno = 0;
-
-    // Check parameters
-    if (!path)
-    {
-        errno = ERROR_INVALID_PARAMETER;
-        return false;
-    }
+    assert(path);
 
     struct stat buf;
-    int32_t ret = GetLStat(path, &buf);
+    int32_t ret = lstat(path, &buf);
     if (ret != 0)
     {
         return false;
diff --git a/src/libpsl-native/test/test-isfile.cpp b/src/libpsl-native/test/test-isfile.cpp
@@ -20,11 +20,5 @@ TEST(IsFileTest, BinLsIsFile)
 TEST(IsFileTest, CannotGetOwnerOfFakeFile)
 {
     EXPECT_FALSE(IsFile("SomeMadeUpFileNameThatDoesNotExist"));
-    EXPECT_EQ(errno, ERROR_FILE_NOT_FOUND);
-}
-
-TEST(IsFileTest, ReturnsFalseForNullInput)
-{
-    EXPECT_FALSE(IsFile(NULL));
-    EXPECT_EQ(errno, ERROR_INVALID_PARAMETER);
+    EXPECT_EQ(errno, ENOENT);
 }
diff --git a/src/libpsl-native/test/test-issymlink.cpp b/src/libpsl-native/test/test-issymlink.cpp
@@ -55,12 +55,6 @@ class isSymLinkTest : public ::testing::Test
     }
 };
 
-TEST_F(isSymLinkTest, FilePathNameIsNull)
-{
-    EXPECT_FALSE(IsSymLink(NULL));
-    EXPECT_EQ(ERROR_INVALID_PARAMETER, errno);
-}
-
 TEST_F(isSymLinkTest, FilePathNameDoesNotExist)
 {
     std::string invalidFile = "/tmp/symlinktest_invalidFile";

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,5 @@ TEST(IsFileTest, BinLsIsFile)`
`20`	`20`	`TEST(IsFileTest, CannotGetOwnerOfFakeFile)`
`21`	`21`	`{`
`22`	`22`	`EXPECT_FALSE(IsFile("SomeMadeUpFileNameThatDoesNotExist"));`
`23`		`- EXPECT_EQ(errno, ERROR_FILE_NOT_FOUND);`
`24`		`-}`
`25`		`-`
`26`		`-TEST(IsFileTest, ReturnsFalseForNullInput)`
`27`		`-{`
`28`		`- EXPECT_FALSE(IsFile(NULL));`
`29`		`- EXPECT_EQ(errno, ERROR_INVALID_PARAMETER);`
	`23`	`+ EXPECT_EQ(errno, ENOENT);`
`30`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,6 @@ class isSymLinkTest : public ::testing::Test`
`55`	`55`	`}`
`56`	`56`	`};`
`57`	`57`
`58`		`-TEST_F(isSymLinkTest, FilePathNameIsNull)`
`59`		`-{`
`60`		`- EXPECT_FALSE(IsSymLink(NULL));`
`61`		`- EXPECT_EQ(ERROR_INVALID_PARAMETER, errno);`
`62`		`-}`
`63`		`-`
`64`	`58`	`TEST_F(isSymLinkTest, FilePathNameDoesNotExist)`
`65`	`59`	`{`
`66`	`60`	`std::string invalidFile = "/tmp/symlinktest_invalidFile";`