smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix PBD::copy_files so that it uses O_BINARY on windows and doesn't add line endings to copied files

Browse source
This commit is contained in:
Tim Mayberry 2014-06-25 09:05:43 +10:00 • committed by Paul Davis
parent 3000399ce1
commit de4fc4843b
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/pbd/file_utils.cc
View file

@ -276,6 +276,14 @@ find_files_matching_filter (vector<string>& result,
run_functor_for_paths (result, paths, filter, arg, true, pass_fullpath, return_fullpath, recurse);
}
#ifdef PLATFORM_WINDOWS
#define WRITE_FLAGS O_RDWR | O_CREAT | O_BINARY
#define READ_FLAGS O_RDONLY | O_BINARY
#else
#define WRITE_FLAGS O_RDWR | O_CREAT
#define READ_FLAGS O_RDONLY
#endif
bool
copy_file(const std::string & from_path, const std::string & to_path)
{
@ -286,12 +294,12 @@ copy_file(const std::string & from_path, const std::string & to_path)
char buf[4096]; // BUFSIZ ??
ssize_t nread;
fd_from = ::open(from_path.c_str(), O_RDONLY);
fd_from = ::open(from_path.c_str(), READ_FLAGS);
if (fd_from < 0) {
goto copy_error;
}
fd_to = ::open(to_path.c_str(), O_WRONLY | O_CREAT, 0666);
fd_to = ::open(to_path.c_str(), WRITE_FLAGS, 0666);
if (fd_to < 0) {
goto copy_error;
}