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

* Added a default low_diskspace check for 500MB.

Browse Source 
* Properly catch the exceptions being thrown by the 'in_*' events.

* Expand ~ in ExecFile.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@950 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-08-07 15:14:57 +00:00
parent 37bc4c85c4
commit ef794b8eda
9 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/exec_file.cc
+23 -11
View File
@@ -37,6 +37,7 @@
#include "config.h"
#include <unistd.h>
#include <rak/path.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -73,12 +74,12 @@ ExecFile::execute(const char* file, char* const* argv) {
}
torrent::Object
ExecFile::execute_object(const torrent::Object& rawArgs) {
char* argsBuffer[128];
ExecFile::execute_object(const torrent::Object& rawArgs, int flags) {
char* argsBuffer[max_args];
char** argsCurrent = argsBuffer;
// Size of strings are less than 24.
char valueBuffer[3072];
// Size of value strings are less than 24.
char valueBuffer[buffer_size];
char* valueCurrent = valueBuffer;
const torrent::Object::list_type& args = rawArgs.as_list();
@@ -87,18 +88,27 @@ ExecFile::execute_object(const torrent::Object& rawArgs) {
throw torrent::input_error("Too few arguments.");
for (torrent::Object::list_type::const_iterator itr = args.begin(), last = args.end(); itr != last; itr++, argsCurrent++) {
if (argsCurrent == argsBuffer + 128 - 1)
if (argsCurrent == argsBuffer + max_args - 1)
throw torrent::input_error("Too many arguments.");
switch (itr->type()) {
case torrent::Object::TYPE_STRING:
*argsCurrent = const_cast<char*>(itr->as_string().c_str());
break;
{
const std::string& str = itr->as_string();
if ((flags & flag_expand_tilde) && *str.c_str() == '~') {
*argsCurrent = valueCurrent;
valueCurrent = rak::path_expand(str.c_str(), valueCurrent, valueBuffer + buffer_size) + 1;
} else {
*argsCurrent = const_cast<char*>(str.c_str());
}
break;
}
case torrent::Object::TYPE_VALUE:
*argsCurrent = valueCurrent;
valueCurrent += std::max(snprintf(valueCurrent, valueBuffer + 3072 - valueCurrent, "%lli", itr->as_value()), 0);
valueCurrent += snprintf(valueCurrent, valueBuffer + buffer_size - valueCurrent, "%lli", itr->as_value()) + 1;
break;
default:
@@ -108,12 +118,14 @@ ExecFile::execute_object(const torrent::Object& rawArgs) {
*argsCurrent = NULL;
// Check if we overflowed the valueBuffer.
int status = execute(argsBuffer[0], argsBuffer);
if (status != 0)
throw torrent::input_error("ExecFile::execute_object(...) status != 0.");
if ((flags & flag_throw) && status != 0)
throw torrent::input_error("Bad return code.");
return torrent::Object();
return torrent::Object((int64_t)status);
}
}