wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

slight changes to open / stat interface to bring in line with SUS (and therefore POSIX, i hope)

Browse Source 
also pass in pmode

This was SVN commit r630.
This commit is contained in:
janwas 2004-07-05 02:30:53 +00:00
parent 66e202afa5
commit e9a7876e0d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/res/file.cpp
View File

@ -290,7 +290,7 @@ int file_enum(const char* const dir, const FileCB cb, const uintptr_t user)
off_t size = s.st_size;
// dir
if(s.st_mode & S_IFDIR)
if(S_ISDIR(s.st_mode))
{
// skip . and ..
if(fn[0] == '.' && (fn[1] == '\0' || (fn[1] == '.' && fn[2] == '\0')))
@ -300,7 +300,7 @@ int file_enum(const char* const dir, const FileCB cb, const uintptr_t user)
size = -1;
}
// skip if neither dir nor file
else if(!(s.st_mode & S_IFREG))
else if(!S_ISREG(s.st_mode))
continue;
const DirEnt* const ent = new DirEnt(fn, flags, size);
@ -437,20 +437,20 @@ int file_open(const char* const p_fn, const uint flags, File* const f)
// don't stat if opening for writing - the file may not exist yet
off_t size = 0;
int mode = O_RDONLY;
int oflag = O_RDONLY;
if(flags & FILE_WRITE)
mode = O_WRONLY;
oflag = O_WRONLY | O_CREAT;
else
{
struct stat s;
if(stat(n_fn, &s) < 0)
return -1;
if(!(s.st_mode & S_IFREG))
if(!S_ISREG(s.st_mode))
return -1;
size = s.st_size;
}
int fd = open(n_fn, mode);
int fd = open(n_fn, oflag, S_IRWXO);
if(fd < 0)
return -1;