From dddf134a3cea47a2ab2ad7ede189d1fe29be7211 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Tue, 24 Nov 2009 15:19:10 +0000 Subject: [PATCH] Provide Path::isSpecialFile interface for PR5568. llvm-svn: 89765 --- llvm/include/llvm/System/Path.h | 5 +++++ llvm/lib/System/Unix/Path.inc | 22 ++++++++++++++++++++-- llvm/lib/System/Win32/Path.inc | 5 +++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/llvm/include/llvm/System/Path.h b/llvm/include/llvm/System/Path.h index 3b73a128fbd1..19684d342679 100644 --- a/llvm/include/llvm/System/Path.h +++ b/llvm/include/llvm/System/Path.h @@ -380,6 +380,11 @@ namespace sys { /// in the file system. bool canWrite() const; + /// This function checks that what we're trying to work only on a regular file or Dir. + /// Check for things like /dev/null, any block special file, + /// or other things that aren't "regular" files. + bool isSpecialFile() const; + /// This function determines if the path name references an executable /// file in the file system. This function checks for the existence and /// executability (by the current program) of the file. diff --git a/llvm/lib/System/Unix/Path.inc b/llvm/lib/System/Unix/Path.inc index 89285b48132f..d134aaa79b3f 100644 --- a/llvm/lib/System/Unix/Path.inc +++ b/llvm/lib/System/Unix/Path.inc @@ -335,7 +335,7 @@ getprogpath(char ret[PATH_MAX], const char *bin) free(pv); return (NULL); } -#endif +#endif // __FreeBSD__ /// GetMainExecutable - Return the path to the main executable, given the /// value of argv[0] from program startup. @@ -453,6 +453,24 @@ Path::canWrite() const { return 0 == access(path.c_str(), W_OK); } +bool +Path::isSpecialFile() const { + // Get the status so we can determine if its a file or directory + struct stat buf; + std::string *ErrStr; + + if (0 != stat(path.c_str(), &buf)) { + MakeErrMsg(ErrStr, path + ": can't get status of file"); + return true; + } + + if (S_ISDIR(buf.st_mode) || S_ISREG(buf.st_mode)) { + return false; + } + + return true; +} + bool Path::canExecute() const { if (0 != access(path.c_str(), R_OK | X_OK )) @@ -723,7 +741,7 @@ Path::createTemporaryFileOnDisk(bool reuse_current, std::string* ErrMsg) { bool Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const { - // Get the status so we can determin if its a file or directory + // Get the status so we can determine if its a file or directory struct stat buf; if (0 != stat(path.c_str(), &buf)) { MakeErrMsg(ErrStr, path + ": can't get status of file"); diff --git a/llvm/lib/System/Win32/Path.inc b/llvm/lib/System/Win32/Path.inc index 573369e97d49..9adeca241034 100644 --- a/llvm/lib/System/Win32/Path.inc +++ b/llvm/lib/System/Win32/Path.inc @@ -357,6 +357,11 @@ Path::canExecute() const { return attr != INVALID_FILE_ATTRIBUTES; } +bool +Path::isSpecialFile() const { + return false; +} + std::string Path::getLast() const { // Find the last slash