1. уточнение 4945: не работала команда if exist.

FarGroup · May 2, 2017 · adf4047 · adf4047
1 parent d65c810
commit adf4047
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+zg 02.05.2017 16:38:35 +0200 - build 4949
+
+1. уточнение 4945: не работала команда if exist.
+
 drkns 01.05.2017 22:42:32 +0000 - build 4948
 
 1. Уточнение 4945.

diff --git a/far/execute.cpp b/far/execute.cpp
@@ -1109,7 +1109,7 @@ static const wchar_t *PrepareOSIfExist(const string& CmdLine)
 		if (!PtrCmd || !*PtrCmd || !starts_with_icase(PtrCmd, Token_If)) //??? IF/I не обрабатывается
 			break;
 
-		PtrCmd += Token_If.size() + 1;
+		PtrCmd += Token_If.size();
 
 		while (*PtrCmd && IsSpace(*PtrCmd))
 			++PtrCmd;
@@ -1121,7 +1121,7 @@ static const wchar_t *PrepareOSIfExist(const string& CmdLine)
 		{
 			Not=TRUE;
 
-			PtrCmd += Token_Not.size() + 1;
+			PtrCmd += Token_Not.size();
 
 			while (*PtrCmd && IsSpace(*PtrCmd))
 				++PtrCmd;
@@ -1133,7 +1133,7 @@ static const wchar_t *PrepareOSIfExist(const string& CmdLine)
 		if (*PtrCmd && starts_with_icase(PtrCmd, Token_Exist))
 		{
 
-			PtrCmd += Token_Exist.size() + 1;
+			PtrCmd += Token_Exist.size();
 
 			while (*PtrCmd && IsSpace(*PtrCmd))
 				++PtrCmd;
@@ -1203,7 +1203,7 @@ static const wchar_t *PrepareOSIfExist(const string& CmdLine)
 		else if (*PtrCmd && starts_with_icase(PtrCmd, Token_Defined))
 		{
 
-			PtrCmd += Token_Defined.size() + 1;
+			PtrCmd += Token_Defined.size();
 
 			while (*PtrCmd && IsSpace(*PtrCmd))
 				++PtrCmd;

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4948)m4_dnl
+m4_define(BUILD,4949)m4_dnl