From faec753dd41d30a13f18b79a87a63a76bcca28c6 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 20 Mar 2014 17:39:04 +0000 Subject: [PATCH] Remove dead and incorrect code. is_symlink was always false since it was using stat instead of lstat. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204361 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FileSystem.h | 18 +----------------- lib/Support/Path.cpp | 15 +-------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index c5c84157533..b511a8e203c 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -454,8 +454,7 @@ inline bool is_regular_file(const Twine &Path) { /// directory, regular file, or symlink? /// /// @param status A file_status previously returned from status. -/// @returns exists(s) && !is_regular_file(s) && !is_directory(s) && -/// !is_symlink(s) +/// @returns exists(s) && !is_regular_file(s) && !is_directory(s) bool is_other(file_status status); /// @brief Is path something that exists but is not a directory, @@ -468,21 +467,6 @@ bool is_other(file_status status); /// platform specific error_code. error_code is_other(const Twine &path, bool &result); -/// @brief Does status represent a symlink? -/// -/// @param status A file_status previously returned from stat. -/// @returns status.type() == symlink_file. -bool is_symlink(file_status status); - -/// @brief Is path a symlink? -/// -/// @param path Input path. -/// @param result Set to true if \a path is a symlink, false if it is not. -/// Undefined otherwise. -/// @returns errc::success if result has been successfully set, otherwise a -/// platform specific error_code. -error_code is_symlink(const Twine &path, bool &result); - /// @brief Get file status as if by POSIX stat(). /// /// @param path Input path. diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp index 895e81f4946..5b73631d989 100644 --- a/lib/Support/Path.cpp +++ b/lib/Support/Path.cpp @@ -870,23 +870,10 @@ error_code is_regular_file(const Twine &path, bool &result) { return error_code::success(); } -bool is_symlink(file_status status) { - return status.type() == file_type::symlink_file; -} - -error_code is_symlink(const Twine &path, bool &result) { - file_status st; - if (error_code ec = status(path, st)) - return ec; - result = is_symlink(st); - return error_code::success(); -} - bool is_other(file_status status) { return exists(status) && !is_regular_file(status) && - !is_directory(status) && - !is_symlink(status); + !is_directory(status); } void directory_entry::replace_filename(const Twine &filename, file_status st) { -- 2.34.1