fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-13 21:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Don't skip the last line in rc files missing the final

Browse Source 
newline. Patch by Jussi Judin under Public Domain.

* Added warnings on usage of scgi_port.

* Include a file's completed chunks count in the resume data.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@973 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-09-04 21:32:42 +00:00
parent 95516fe3b5
commit 48f13fb7a3
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/parse_commands.cc
+13 -5
View File
@@ -162,17 +162,25 @@ parse_command_file(const std::string& path) {
try {
unsigned int getCount = 0;
while (file.getline(buffer + getCount, 4096 - getCount).good()) {
while (file.good()
&& !file.getline(buffer + getCount, 4096 - getCount).fail()) {
if (file.gcount() == 0)
throw torrent::internal_error("parse_command_file(...) file.gcount() == 0.");
int escaped = parse_count_escaped(buffer + getCount, buffer + getCount + file.gcount() - 1);
int lineLength = file.gcount() - 1;
// In case we are at the end of the file and the last character is
// not a line feed, we'll just increase the read character count so
// that the last would also be included in option line.
if (file.eof() && file.get() != '\n')
lineLength++;
int escaped = parse_count_escaped(buffer + getCount, buffer + getCount + lineLength);
lineNumber++;
getCount += file.gcount() - 1;
getCount += lineLength;
if (getCount == 4096 - 1)
throw torrent::input_error("Exceeded max line lenght.");
throw torrent::input_error("Exceeded max line length.");
if (escaped & 0x1) {
// Remove the escape characters and continue reading.