Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b3561bf8
Commit
b3561bf8
authored
Sep 16, 2011
by
Frédéric Delanoy
Committed by
Alexandre Julliard
Sep 16, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmd: echo_mode has BOOL type instead of int.
parent
bf63385f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
builtins.c
programs/cmd/builtins.c
+4
-3
wcmdmain.c
programs/cmd/wcmdmain.c
+4
-3
No files found.
programs/cmd/builtins.c
View file @
b3561bf8
...
...
@@ -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
);
...
...
programs/cmd/wcmdmain.c
View file @
b3561bf8
...
...
@@ -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
p
rev_echo_mode
,
p
iped
=
FALSE
;
WINE_TRACE
(
"command on entry:%s (%p), with forVariable '%s'='%s'
\n
"
,
wine_dbgstr_w
(
command
),
cmdList
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment