From 4536bd721117a67c97b457571cfe5c20b74b6d3b Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 17 Oct 2009 13:13:32 +0000 Subject: [PATCH] 2009-10-17 Tatsuhiro Tsujikawa Allowed non-regular file in LocalFilePathOptionHandler * src/OptionHandlerImpl.h * src/message.h --- ChangeLog | 6 ++++++ src/OptionHandlerImpl.h | 3 ++- src/message.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb74e885..4b5dfebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-10-17 Tatsuhiro Tsujikawa + + Allowed non-regular file in LocalFilePathOptionHandler + * src/OptionHandlerImpl.h + * src/message.h + 2009-10-17 Tatsuhiro Tsujikawa Fixed the bug that Netrc::parse() cannot recognize comment line. diff --git a/src/OptionHandlerImpl.h b/src/OptionHandlerImpl.h index b4bbc210..ecfe412d 100644 --- a/src/OptionHandlerImpl.h +++ b/src/OptionHandlerImpl.h @@ -587,7 +587,8 @@ public: virtual void parseArg(Option& option, const std::string& optarg) { - if(!File(optarg).isFile()) { + File f(optarg); + if(!f.exists() || f.isDir()) { throw DL_ABORT_EX (StringFormat(MSG_NOT_FILE, optarg.c_str()).str()); } diff --git a/src/message.h b/src/message.h index 8e8143f3..5500e496 100644 --- a/src/message.h +++ b/src/message.h @@ -174,7 +174,7 @@ #define MSG_GID_NOT_PROVIDED "GID is not provided." #define MSG_CANNOT_PARSE_XML_RPC_REQUEST "Failed to parse xml-rpc request." #define MSG_GOOD_BYE_SEEDER "Client is in seed state: Good Bye Seeder;)" -#define MSG_NOT_FILE _("Is '%s' a regular file?") +#define MSG_NOT_FILE _("Is '%s' a file?") #define EX_TIME_OUT _("Timeout.") #define EX_INVALID_CHUNK_SIZE _("Invalid chunk size.")