NixOS/patchelf
1
0
Fork 0
mirror of https://github.com/NixOS/patchelf.git synced 2025-10-19 19:53:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #372 from JagoGyselinck/master

Browse Source 
Add O_BINARY flag when opening files to allow compilation for Windows
This commit is contained in:
Jörg Thalheim
2022-04-07 07:26:17 +01:00
committed by GitHub
parent 8f5ac59ade 676326c0cf
commit 31d052c1fd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/patchelf.cc
View File

@@ -47,6 +47,11 @@
#define PACKAGE_STRING "patchelf" #define PACKAGE_STRING "patchelf"
#endif #endif
// This is needed for Windows/mingw
#ifndef O_BINARY
#define O_BINARY 0
#endif
static bool debugMode = false; static bool debugMode = false;
static bool forceRPath = false; static bool forceRPath = false;
@@ -164,7 +169,7 @@ static FileContents readFile(const std::string & fileName,
FileContents contents = std::make_shared<std::vector<unsigned char>>(size); FileContents contents = std::make_shared<std::vector<unsigned char>>(size);
int fd = open(fileName.c_str(), O_RDONLY); int fd = open(fileName.c_str(), O_RDONLY | O_BINARY);
if (fd == -1) throw SysError(fmt("opening '", fileName, "'")); if (fd == -1) throw SysError(fmt("opening '", fileName, "'"));
size_t bytesRead = 0; size_t bytesRead = 0;
@@ -375,7 +380,7 @@ static void writeFile(const std::string & fileName, const FileContents & content
{ {
debug("writing %s\n", fileName.c_str()); debug("writing %s\n", fileName.c_str());
int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0777);
if (fd == -1) if (fd == -1)
error("open"); error("open");