Merge branch 'v0.4.4-dev' of github.com:wiiu-env/ftpiiu_plugin into u…

…pstream_changes

# Conflicts:
#	source/ftpSession.cpp

source/ftpSession.cpp

@@ -1432,21 +1432,28 @@ void FtpSession::xferDir (char const *const args_, XferDirMode const mode_, bool
 
 	if (std::strlen (args_) > 0)
 	{
-		// work around broken clients that think LIST -a/-l is valid
-		auto const needWorkaround = workaround_ && args_[0] == '-' &&
-		                            (args_[1] == 'a' || args_[1] == 'l') &&
-		                            (args_[2] == '\0' || args_[2] == ' ');
-
 		// an argument was provided
-		auto const path = buildResolvedPath (m_cwd, args_);
-		if (path.empty ())
+
+		// work around broken clients that think LIST -a/-l is valid
+		if (workaround_)
 		{
-			if (needWorkaround)
+			if (args_[0] == '-' && (args_[1] == 'a' || args_[1] == 'l'))
 			{
-				xferDir (args_ + 2 + (args_[2] == ' '), mode_, false);
-				return;
+				char const *args = &args_[2];
+				if (*args == '\0' || *args == ' ')
+				{
+					if (*args == ' ')
+						++args;
+
+					xferDir (args, mode_, false);
+					return;
+				}
 			}
+		}
 
+		auto path = buildResolvedPath (m_cwd, args_);
+		if (path.empty ())
+		{
 			sendResponse ("550 %s\r\n", std::strerror (errno));
 			setState (State::COMMAND, true, true);
 			return;
@@ -1455,12 +1462,6 @@ void FtpSession::xferDir (char const *const args_, XferDirMode const mode_, bool
 		stat_t st;
 		if (tzStat (path.c_str (), &st) != 0)
 		{
-			if (needWorkaround)
-			{
-				xferDir (args_ + 2 + (args_[2] == ' '), mode_, false);
-				return;
-			}
-
 			sendResponse ("550 %s\r\n", std::strerror (errno));
 			setState (State::COMMAND, true, true);
 			return;