Skip to content

Properly detect Linux with glibc to detect what's not #1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Properly detect Linux with glibc to detect what's not #1874

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54f333c
FileSystem: properly detect Linux with glibc to detect what's not
illwieckz Nov 13, 2025
81d12ce
FileSystem: let Native Client do open() like others
illwieckz Nov 13, 2025
6df1517
FileSystem: mutualize the open64() selection
illwieckz Nov 27, 2025
d62d364
FileSystem: open64() is for large file, O_LARGEFILE is redundant
illwieckz Nov 27, 2025
324d13b
FileSystem: drop open64(), glibc remap open() and others with _FILE_O…
illwieckz Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 14 additions & 25 deletions src/common/FileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================
*/

#if defined(__GLIBC__)
#define _FILE_OFFSET_BITS 64
Copy link
Member

@slipher slipher Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would expect this not to work correctly since when precompiled headers are used, the PCH is inserted before the file contents. Anyway that sort of thing would be better added from the build system.

Also please squash file offset size-related commits together.

#endif

#if defined(BUILD_ENGINE)
#include "minizip/unzip.h"
#endif
Expand Down Expand Up @@ -175,6 +179,7 @@ enum class openMode_t {
MODE_APPEND,
MODE_EDIT
};

inline int my_open(Str::StringRef path, openMode_t mode)
{
int mode_ = Util::ordinal(mode);
Expand All @@ -192,14 +197,10 @@ inline int my_open(Str::StringRef path, openMode_t mode)
int fd = _open_osfhandle(reinterpret_cast<intptr_t>(h), modes[mode_] | O_BINARY | O_NOINHERIT);
if (fd == -1)
CloseHandle(h);
#elif defined(__FreeBSD__) || defined(__APPLE__)
// O_CLOEXEC is supported in macOS from 10.7 onwards
#else
// This doesn't actually work in Native Client, but it's not used anyways.
// O_CLOEXEC is supported in macOS from 10.7 onwards.
int fd = open(path.c_str(), modes[mode_] | O_CLOEXEC, 0666);
#elif defined(__linux__)
int fd = open64(path.c_str(), modes[mode_] | O_CLOEXEC | O_LARGEFILE, 0666);
#elif defined(__native_client__)
// This doesn't actually work, but it's not used anyways
int fd = open(path.c_str(), modes[mode_], 0666);
#endif

#ifndef _WIN32
Expand Down Expand Up @@ -238,47 +239,37 @@ inline offset_t my_ftell(FILE* fd)
{
#ifdef _WIN32
return _ftelli64(fd);
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
#else
return ftello(fd);
#elif defined(__linux__)
return ftello64(fd);
#endif
}
inline int my_fseek(FILE* fd, offset_t off, int whence)
{
#ifdef _WIN32
return _fseeki64(fd, off, whence);
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
#else
return fseeko(fd, off, whence);
#elif defined(__linux__)
return fseeko64(fd, off, whence);
#endif
}
#ifdef _WIN32
typedef struct _stati64 my_stat_t;
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
#else
using my_stat_t = struct stat;
#elif defined(__linux__)
using my_stat_t = struct stat64;
#endif
inline int my_fstat(int fd, my_stat_t* st)
{
#ifdef _WIN32
return _fstati64(fd, st);
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
#else
return fstat(fd, st);
#elif defined(__linux__)
return fstat64(fd, st);
#endif
}
inline int my_stat(Str::StringRef path, my_stat_t* st)
{
#ifdef _WIN32
return _wstati64(Str::UTF8To16(path).c_str(), st);
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
#else
return stat(path.c_str(), st);
#elif defined(__linux__)
return stat64(path.c_str(), st);
#endif
}
inline intptr_t my_pread(int fd, void* buf, size_t count, offset_t offset)
Expand All @@ -294,10 +285,8 @@ inline intptr_t my_pread(int fd, void* buf, size_t count, offset_t offset)
return -1;
}
return bytesRead;
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
#else
return pread(fd, buf, count, offset);
#elif defined(__linux__)
return pread64(fd, buf, count, offset);
#endif
}

Expand Down
Loading