generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-30 21:50:47 +01:00
Code Issues Projects Releases Wiki Activity

fixes from 1.3

Browse Source
This commit is contained in:
Guenter Obiltschnig
2008-09-21 20:38:52 +00:00
parent 8e58146848
commit 14fed4c986
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Foundation/src/Environment_UNIX.cpp
View File

@@ -1,7 +1,7 @@
//
// Environment_UNIX.cpp
//
// $Id: //poco/1.3/Foundation/src/Environment_UNIX.cpp#3 $
// $Id: //poco/1.3/Foundation/src/Environment_UNIX.cpp#4 $
//
// Library: Foundation
// Package: Core
@@ -39,6 +39,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <sys/utsname.h>
#include <cstring>
namespace Poco {

20
Foundation/src/File_UNIX.cpp
View File

@@ -1,7 +1,7 @@
//
// File_UNIX.cpp
//
// $Id: //poco/1.3/Foundation/src/File_UNIX.cpp#10 $
// $Id: //poco/1.3/Foundation/src/File_UNIX.cpp#12 $
//
// Library: Foundation
// Package: Filesystem
@@ -97,13 +97,12 @@ bool FileImpl::canReadImpl() const
{
poco_assert (!_path.empty());
if (geteuid() == 0)
return true;
struct stat st;
if (stat(_path.c_str(), &st) == 0)
{
if (st.st_uid == geteuid())
if (geteuid() == 0)
return true;
else if (st.st_uid == geteuid())
return (st.st_mode & S_IRUSR) != 0;
else if (st.st_gid == getegid())
return (st.st_mode & S_IRGRP) != 0;
@@ -119,13 +118,12 @@ bool FileImpl::canWriteImpl() const
{
poco_assert (!_path.empty());
if (geteuid() == 0)
return true;
struct stat st;
if (stat(_path.c_str(), &st) == 0)
{
if (st.st_uid == geteuid())
if (geteuid() == 0)
return true;
else if (st.st_uid == geteuid())
return (st.st_mode & S_IWUSR) != 0;
else if (st.st_gid == getegid())
return (st.st_mode & S_IWGRP) != 0;
@@ -144,7 +142,7 @@ bool FileImpl::canExecuteImpl() const
struct stat st;
if (stat(_path.c_str(), &st) == 0)
{
if (st.st_uid == geteuid())
if (st.st_uid == geteuid() || geteuid() == 0)
return (st.st_mode & S_IXUSR) != 0;
else if (st.st_gid == getegid())
return (st.st_mode & S_IXGRP) != 0;
@@ -209,7 +207,7 @@ Timestamp FileImpl::createdImpl() const
{
poco_assert (!_path.empty());
#if defined(__APPLE__)
#if defined(__APPLE__) && defined(st_birthtime) // st_birthtime is available only on 10.5
struct stat64 st;
if (stat64(_path.c_str(), &st) == 0)
return Timestamp::fromEpochTime(st.st_birthtime);