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

2010-08-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Changed signature of util::executeHook().
	* src/RequestGroupMan.cc
	* src/util.cc
	* src/util.h
pull/1/head
Tatsuhiro Tsujikawa 2010-08-28 08:47:21 +00:00
parent d5bb40ce9e
commit b49081340d
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2010-08-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Changed signature of util::executeHook().
* src/RequestGroupMan.cc
* src/util.cc
* src/util.h
2010-08-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-08-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Wait data arrives at clientSocket_ in Wait data arrives at clientSocket_ in

9
src/RequestGroupMan.cc
View File

@ -255,12 +255,15 @@ static void executeStopHook
{ {
if(result->result == downloadresultcode::FINISHED && if(result->result == downloadresultcode::FINISHED &&
!option->blank(PREF_ON_DOWNLOAD_COMPLETE)) { !option->blank(PREF_ON_DOWNLOAD_COMPLETE)) {
util::executeHook(option->get(PREF_ON_DOWNLOAD_COMPLETE), result->gid); util::executeHook(option->get(PREF_ON_DOWNLOAD_COMPLETE),
util::itos(result->gid));
} else if(result->result != downloadresultcode::IN_PROGRESS && } else if(result->result != downloadresultcode::IN_PROGRESS &&
!option->blank(PREF_ON_DOWNLOAD_ERROR)) { !option->blank(PREF_ON_DOWNLOAD_ERROR)) {
util::executeHook(option->get(PREF_ON_DOWNLOAD_ERROR), result->gid); util::executeHook(option->get(PREF_ON_DOWNLOAD_ERROR),
util::itos(result->gid));
} else if(!option->blank(PREF_ON_DOWNLOAD_STOP)) { } else if(!option->blank(PREF_ON_DOWNLOAD_STOP)) {
util::executeHook(option->get(PREF_ON_DOWNLOAD_STOP), result->gid); util::executeHook(option->get(PREF_ON_DOWNLOAD_STOP),
util::itos(result->gid));
} }
} }

10
src/util.cc
View File

@ -1346,17 +1346,17 @@ void removeMetalinkContentTypes(const SharedHandle<RequestGroup>& group)
} }
} }
void executeHook(const std::string& command, gid_t gid) void executeHook(const std::string& command, const std::string& arg)
{ {
LogFactory::getInstance()->info("Executing user command: %s %s", LogFactory::getInstance()->info("Executing user command: %s %s",
command.c_str(), util::itos(gid).c_str()); command.c_str(), arg.c_str());
#ifndef __MINGW32__ #ifndef __MINGW32__
pid_t cpid = fork(); pid_t cpid = fork();
if(cpid == -1) { if(cpid == -1) {
LogFactory::getInstance()->error("fork() failed." LogFactory::getInstance()->error("fork() failed."
" Cannot execute user command."); " Cannot execute user command.");
} else if(cpid == 0) { } else if(cpid == 0) {
execl(command.c_str(), command.c_str(), util::itos(gid).c_str(), execl(command.c_str(), command.c_str(), arg.c_str(),
reinterpret_cast<char*>(0)); reinterpret_cast<char*>(0));
perror(("Could not execute user command: "+command).c_str()); perror(("Could not execute user command: "+command).c_str());
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -1371,7 +1371,7 @@ void executeHook(const std::string& command, gid_t gid)
memset(&pi, 0, sizeof (pi)); memset(&pi, 0, sizeof (pi));
std::string cmdline = command; std::string cmdline = command;
strappend(cmdline, " ", util::itos(gid)); strappend(cmdline, " ", arg);
DWORD rc = CreateProcess( DWORD rc = CreateProcess(
NULL, NULL,
@ -1402,7 +1402,7 @@ void executeHookByOptName
(const RequestGroup* group, const Option* option, const std::string& opt) (const RequestGroup* group, const Option* option, const std::string& opt)
{ {
if(!option->blank(opt)) { if(!option->blank(opt)) {
executeHook(option->get(opt), group->getGID()); executeHook(option->get(opt), util::itos(group->getGID()));
} }
} }

2
src/util.h
View File

@ -396,7 +396,7 @@ bool inSameCidrBlock(const std::string& ip1, const std::string& ip2, int bits);
void removeMetalinkContentTypes(const SharedHandle<RequestGroup>& group); void removeMetalinkContentTypes(const SharedHandle<RequestGroup>& group);
void executeHook(const std::string& command, gid_t gid); void executeHook(const std::string& command, const std::string& arg);
void executeHookByOptName void executeHookByOptName
(const SharedHandle<RequestGroup>& group, const Option* option, (const SharedHandle<RequestGroup>& group, const Option* option,