Rewritten NsCookieParser using BufferedFile

pull/1/head
Tatsuhiro Tsujikawa 2011-08-06 21:59:06 +09:00
parent f38c2d2012
commit c553d92f45
1 changed files with 3 additions and 7 deletions

View File

@ -44,6 +44,7 @@
#include "fmt.h"
#include "Cookie.h"
#include "cookie_helper.h"
#include "BufferedFile.h"
namespace aria2 {
@ -95,22 +96,17 @@ bool parseNsCookie
std::vector<Cookie> NsCookieParser::parse
(const std::string& filename, time_t creationTime)
{
FILE* fp = a2fopen(utf8ToWChar(filename).c_str(), "rb");
BufferedFile fp(filename, BufferedFile::READ);
if(!fp) {
throw DL_ABORT_EX(fmt("Failed to open file %s",
utf8ToNative(filename).c_str()));
}
auto_delete_r<FILE*, int> deleter(fp, fclose);
std::vector<Cookie> cookies;
char buf[8192];
while(1) {
if(!fgets(buf, sizeof(buf), fp)) {
if(!fp.getsn(buf, sizeof(buf))) {
break;
}
size_t len = strlen(buf);
if(buf[len-1] == '\n') {
buf[len-1] = '\0';
}
std::string line(buf);
if(util::startsWith(line, A2STR::SHARP_C)) {
continue;