github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactored file open code

pull/36/head
Tatsuhiro Tsujikawa 2012-11-28 21:46:44 +09:00
parent 16e25ef4e1
commit 506a9358e1
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/AbstractDiskWriter.cc
View File

@ -104,6 +104,24 @@ void AbstractDiskWriter::closeFile()
} }
} }
namespace {
int openFileWithFlags(const std::string& filename, int flags,
error_code::Value errCode)
{
int fd;
while((fd = a2open(utf8ToWChar(filename).c_str(), flags, OPEN_MODE)) == -1
&& errno == EINTR);
if(fd < 0) {
int errNum = errno;
throw DL_ABORT_EX3(errNum, fmt(EX_FILE_OPEN,
filename.c_str(),
util::safeStrerror(errNum).c_str()),
errCode);
}
return fd;
}
} // namespace
void AbstractDiskWriter::openExistingFile(int64_t totalLength) void AbstractDiskWriter::openExistingFile(int64_t totalLength)
{ {
int flags = O_BINARY; int flags = O_BINARY;
@ -112,37 +130,15 @@ void AbstractDiskWriter::openExistingFile(int64_t totalLength)
} else { } else {
flags |= O_RDWR; flags |= O_RDWR;
} }
while((fd_ = a2open(utf8ToWChar(filename_).c_str(), fd_ = openFileWithFlags(filename_, flags, error_code::FILE_OPEN_ERROR);
flags, OPEN_MODE)) == -1 &&
errno == EINTR);
if(fd_ < 0) {
int errNum = errno;
throw DL_ABORT_EX3
(errNum,
fmt(EX_FILE_OPEN,
filename_.c_str(),
util::safeStrerror(errNum).c_str()),
error_code::FILE_OPEN_ERROR);
}
} }
void AbstractDiskWriter::createFile(int addFlags) void AbstractDiskWriter::createFile(int addFlags)
{ {
assert(!filename_.empty()); assert(!filename_.empty());
util::mkdirs(File(filename_).getDirname()); util::mkdirs(File(filename_).getDirname());
fd_ = openFileWithFlags(filename_, O_CREAT|O_RDWR|O_TRUNC|O_BINARY|addFlags,
while((fd_ = a2open(utf8ToWChar(filename_).c_str(), error_code::FILE_CREATE_ERROR);
O_CREAT|O_RDWR|O_TRUNC|O_BINARY|addFlags,
OPEN_MODE)) == -1 && errno == EINTR);
if(fd_ < 0) {
int errNum = errno;
throw DL_ABORT_EX3
(errNum,
fmt(EX_FILE_OPEN,
filename_.c_str(),
util::safeStrerror(errNum).c_str()),
error_code::FILE_CREATE_ERROR);
}
} }
ssize_t AbstractDiskWriter::writeDataInternal(const unsigned char* data, ssize_t AbstractDiskWriter::writeDataInternal(const unsigned char* data,