corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 169506 nsLocalFileUnix have problems with BeOS. IsExecutable()...

Browse Source 
patch by thesuckiestemail@yahoo.se r=sergei_d moa=dougt
This commit is contained in:
timeless@mozdev.org
2005-01-30 08:55:16 +00:00
parent 0feea3794e
commit 298892a48b
1 changed files with 80 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
xpcom/io/nsLocalFileUnix.cpp
View File

@@ -28,6 +28,7 @@
* Brendan Eich <brendan@mozilla.org> * Brendan Eich <brendan@mozilla.org>
* Pete Collins <petejc@mozdev.org> * Pete Collins <petejc@mozdev.org>
* Paul Ashford <arougthopher@lizardland.net> * Paul Ashford <arougthopher@lizardland.net>
* Fredrik Holmqvist <thesuckiestemail@yahoo.se>
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"), * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -444,7 +445,6 @@ nsLocalFile::CreateAndKeepOpen(PRUint32 type, PRIntn flags,
#endif #endif
result = createFunc(mPath.get(), flags, permissions, _retval); result = createFunc(mPath.get(), flags, permissions, _retval);
} }
return NSRESULT_FOR_RETURN(result); return NSRESULT_FOR_RETURN(result);
} }
@@ -1221,6 +1221,67 @@ nsLocalFile::GetParent(nsIFile **aParent)
* The results of Exists, isWritable and isReadable are not cached. * The results of Exists, isWritable and isReadable are not cached.
*/ */
#ifdef XP_BEOS
// access() is buggy in BeOS POSIX implementation, at least for BFS, using stat() instead
// see bug 169506, https://bugzilla.mozilla.org/show_bug.cgi?id=169506
NS_IMETHODIMP
nsLocalFile::Exists(PRBool *_retval)
{
CHECK_mPath();
NS_ENSURE_ARG_POINTER(_retval);
struct stat buf;
*_retval = (stat(mPath.get(), &buf) == 0);
return NS_OK;
}
NS_IMETHODIMP
nsLocalFile::IsWritable(PRBool *_retval)
{
CHECK_mPath();
NS_ENSURE_ARG_POINTER(_retval);
struct stat buf;
*_retval = (stat(mPath.get(), &buf) == 0);
if (*_retval || errno == EACCES) {
*_retval = *_retval && (buf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH ));
return NS_OK;
}
return NSRESULT_FOR_ERRNO();
}
NS_IMETHODIMP
nsLocalFile::IsReadable(PRBool *_retval)
{
CHECK_mPath();
NS_ENSURE_ARG_POINTER(_retval);
struct stat buf;
*_retval = (stat(mPath.get(), &buf) == 0);
if (*_retval || errno == EACCES) {
*_retval = *_retval && (buf.st_mode & (S_IRUSR | S_IRGRP | S_IROTH ));
return NS_OK;
}
return NSRESULT_FOR_ERRNO();
}
NS_IMETHODIMP
nsLocalFile::IsExecutable(PRBool *_retval)
{
CHECK_mPath();
NS_ENSURE_ARG_POINTER(_retval);
struct stat buf;
*_retval = (stat(mPath.get(), &buf) == 0);
if (*_retval || errno == EACCES) {
*_retval = *_retval && (buf.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH ));
return NS_OK;
}
return NSRESULT_FOR_ERRNO();
}
#else
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::Exists(PRBool *_retval) nsLocalFile::Exists(PRBool *_retval)
{ {
@@ -1231,47 +1292,7 @@ nsLocalFile::Exists(PRBool *_retval)
return NS_OK; return NS_OK;
} }
#ifdef XP_BEOS
// access() is buggy in BeOS POSIX implementation, at least for BFS, using stat() instead
NS_IMETHODIMP
nsLocalFile::IsWritable(PRBool *_retval)
{
CHECK_mPath();
NS_ENSURE_ARG_POINTER(_retval);
struct stat buf;
*_retval = (stat(mPath.get(), &buf) == 0);
*_retval = *_retval && (buf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH ));
if (*_retval || errno == EACCES)
return NS_OK;
return NSRESULT_FOR_ERRNO();
}
NS_IMETHODIMP
nsLocalFile::IsReadable(PRBool *_retval)
{
CHECK_mPath();
NS_ENSURE_ARG_POINTER(_retval);
struct stat buf;
*_retval = (stat(mPath.get(), &buf) == 0);
*_retval = *_retval && (buf.st_mode & (S_IRUSR | S_IRGRP | S_IROTH ));
if (*_retval || errno == EACCES)
return NS_OK;
return NSRESULT_FOR_ERRNO();
}
NS_IMETHODIMP
nsLocalFile::IsExecutable(PRBool *_retval)
{
CHECK_mPath();
NS_ENSURE_ARG_POINTER(_retval);
struct stat buf;
*_retval = (stat(mPath.get(), &buf) == 0);
*_retval = *_retval && (buf.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH ));
if (*_retval || errno == EACCES)
return NS_OK;
return NSRESULT_FOR_ERRNO();
}
#else
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::IsWritable(PRBool *_retval) nsLocalFile::IsWritable(PRBool *_retval)
{ {
@@ -1566,6 +1587,11 @@ NS_IMETHODIMP
nsLocalFile::Reveal() nsLocalFile::Reveal()
{ {
BPath bPath(mPath.get()); BPath bPath(mPath.get());
PRBool isDirectory;
if (NS_FAILED(IsDirectory(&isDirectory)))
return NS_ERROR_FAILURE;
if(!isDirectory)
bPath.GetParent(&bPath); bPath.GetParent(&bPath);
entry_ref ref; entry_ref ref;
get_ref_for_path(bPath.Path(),&ref); get_ref_for_path(bPath.Path(),&ref);