Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 04:37:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] parser.c, cmd.c/h : Code style and formatting fixes.

Browse source 
- Change C_IFFAILURE, C_IFSUCCESS into C_OR, C_AND respectively.
This commit is contained in:
Hermès Bélusca-Maïto 2020-07-26 20:32:11 +02:00
parent 93ee4e7efa
commit 04eef6d20c
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/shell/cmd/cmd.c
View file

@ -801,7 +801,7 @@ ExecuteCommand(
for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next)
Ret = ExecuteCommand(Sub); Ret = ExecuteCommand(Sub);
break; break;
case C_IFFAILURE: case C_OR:
Sub = Cmd->Subcommands; Sub = Cmd->Subcommands;
Ret = ExecuteCommand(Sub); Ret = ExecuteCommand(Sub);
if (Ret != 0) if (Ret != 0)
@ -810,7 +810,7 @@ ExecuteCommand(
Ret = ExecuteCommand(Sub->Next); Ret = ExecuteCommand(Sub->Next);
} }
break; break;
case C_IFSUCCESS: case C_AND:
Sub = Cmd->Subcommands; Sub = Cmd->Subcommands;
Ret = ExecuteCommand(Sub); Ret = ExecuteCommand(Sub);
if (Ret == 0) if (Ret == 0)

2
base/shell/cmd/cmd.h
View file

@ -301,7 +301,7 @@ INT cmd_move (LPTSTR);
INT CommandMsgbox (LPTSTR); INT CommandMsgbox (LPTSTR);
/* Prototypes from PARSER.C */ /* Prototypes from PARSER.C */
enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_IFFAILURE, C_IFSUCCESS, C_PIPE, C_IF, C_FOR }; enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_OR, C_AND, C_PIPE, C_IF, C_FOR };
typedef struct _PARSED_COMMAND typedef struct _PARSED_COMMAND
{ {
struct _PARSED_COMMAND *Subcommands; struct _PARSED_COMMAND *Subcommands;

18
base/shell/cmd/parser.c
View file

@ -823,8 +823,10 @@ EchoCommand(PARSED_COMMAND *Cmd)
if (SubstituteForVars(Cmd->Command.Rest, Buf)) if (SubstituteForVars(Cmd->Command.Rest, Buf))
ConOutPrintf(_T("%s"), Buf); ConOutPrintf(_T("%s"), Buf);
break; break;
case C_QUIET: case C_QUIET:
return; return;
case C_BLOCK: case C_BLOCK:
ConOutChar(_T('(')); ConOutChar(_T('('));
Sub = Cmd->Subcommands; Sub = Cmd->Subcommands;
@ -846,15 +848,17 @@ EchoCommand(PARSED_COMMAND *Cmd)
} }
ConOutChar(_T(')')); ConOutChar(_T(')'));
break; break;
case C_MULTI: case C_MULTI:
case C_IFFAILURE: case C_OR:
case C_IFSUCCESS: case C_AND:
case C_PIPE: case C_PIPE:
Sub = Cmd->Subcommands; Sub = Cmd->Subcommands;
EchoCommand(Sub); EchoCommand(Sub);
ConOutPrintf(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]); ConOutPrintf(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]);
EchoCommand(Sub->Next); EchoCommand(Sub->Next);
break; break;
case C_IF: case C_IF:
ConOutPrintf(_T("if")); ConOutPrintf(_T("if"));
if (Cmd->If.Flags & IFFLAG_IGNORECASE) if (Cmd->If.Flags & IFFLAG_IGNORECASE)
@ -874,6 +878,7 @@ EchoCommand(PARSED_COMMAND *Cmd)
EchoCommand(Sub->Next); EchoCommand(Sub->Next);
} }
break; break;
case C_FOR: case C_FOR:
ConOutPrintf(_T("for")); ConOutPrintf(_T("for"));
if (Cmd->For.Switches & FOR_DIRS) ConOutPrintf(_T(" /D")); if (Cmd->For.Switches & FOR_DIRS) ConOutPrintf(_T(" /D"));
@ -947,10 +952,12 @@ do { \
if (!SubstituteForVars(Cmd->Command.Rest, Buf)) return NULL; if (!SubstituteForVars(Cmd->Command.Rest, Buf)) return NULL;
STRING(Buf); STRING(Buf);
break; break;
case C_QUIET: case C_QUIET:
CHAR(_T('@')); CHAR(_T('@'));
RECURSE(Cmd->Subcommands); RECURSE(Cmd->Subcommands);
break; break;
case C_BLOCK: case C_BLOCK:
CHAR(_T('(')); CHAR(_T('('));
for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next)
@ -961,15 +968,17 @@ do { \
} }
CHAR(_T(')')); CHAR(_T(')'));
break; break;
case C_MULTI: case C_MULTI:
case C_IFFAILURE: case C_OR:
case C_IFSUCCESS: case C_AND:
case C_PIPE: case C_PIPE:
Sub = Cmd->Subcommands; Sub = Cmd->Subcommands;
RECURSE(Sub); RECURSE(Sub);
PRINTF(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]); PRINTF(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]);
RECURSE(Sub->Next); RECURSE(Sub->Next);
break; break;
case C_IF: case C_IF:
STRING(_T("if")); STRING(_T("if"));
if (Cmd->If.Flags & IFFLAG_IGNORECASE) if (Cmd->If.Flags & IFFLAG_IGNORECASE)
@ -989,6 +998,7 @@ do { \
RECURSE(Sub->Next); RECURSE(Sub->Next);
} }
break; break;
case C_FOR: case C_FOR:
STRING(_T("for")); STRING(_T("for"));
if (Cmd->For.Switches & FOR_DIRS) STRING(_T(" /D")); if (Cmd->For.Switches & FOR_DIRS) STRING(_T(" /D"));