cmd: echo_mode has BOOL type instead of int.

This commit is contained in:
Frédéric Delanoy 2011-09-16 08:44:06 +02:00 committed by Alexandre Julliard
parent bf63385fab
commit b3561bf82e
2 changed files with 8 additions and 6 deletions

View File

@ -50,7 +50,8 @@ struct env_stack *pushd_directories;
extern HINSTANCE hinst;
extern WCHAR inbuilt[][10];
extern int echo_mode, verify_mode, defaultColor;
extern int verify_mode, defaultColor;
extern BOOL echo_mode;
extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
extern BATCH_CONTEXT *context;
extern DWORD errorlevel;
@ -876,11 +877,11 @@ void WCMD_echo (const WCHAR *command) {
return;
}
if (lstrcmpiW(command, onW) == 0) {
echo_mode = 1;
echo_mode = TRUE;
return;
}
if (lstrcmpiW(command, offW) == 0) {
echo_mode = 0;
echo_mode = FALSE;
return;
}
WCMD_output_asis (command);

View File

@ -86,7 +86,8 @@ const WCHAR externals[NUM_EXTERNALS][10] = {
HINSTANCE hinst;
DWORD errorlevel;
int echo_mode = 1, verify_mode = 0, defaultColor = 7;
int verify_mode = 0, defaultColor = 7;
BOOL echo_mode = TRUE;
static int opt_c, opt_k, opt_s;
const WCHAR newline[] = {'\r','\n','\0'};
static const WCHAR equalsW[] = {'=','\0'};
@ -1233,7 +1234,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects,
CMD_LIST **cmdList)
{
WCHAR *cmd, *p, *redir;
int status, i, prev_echo_mode;
int status, i;
DWORD count, creationDisposition;
HANDLE h;
WCHAR *whichcmd;
@ -1246,7 +1247,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects,
DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE,
STD_OUTPUT_HANDLE,
STD_ERROR_HANDLE};
BOOL piped = FALSE;
BOOL prev_echo_mode, piped = FALSE;
WINE_TRACE("command on entry:%s (%p), with forVariable '%s'='%s'\n",
wine_dbgstr_w(command), cmdList,