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
9c616563
Commit
9c616563
authored
Sep 24, 2011
by
Frédéric Delanoy
Committed by
Alexandre Julliard
Sep 26, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmd: Output error messages to stderr where appropriate.
parent
fbddecab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
19 deletions
+19
-19
batch.c
programs/cmd/batch.c
+1
-1
builtins.c
programs/cmd/builtins.c
+18
-18
No files found.
programs/cmd/batch.c
View file @
9c616563
...
@@ -585,7 +585,7 @@ void WCMD_call (WCHAR *command) {
...
@@ -585,7 +585,7 @@ void WCMD_call (WCHAR *command) {
SetFilePointer
(
context
->
h
,
li
.
u
.
LowPart
,
SetFilePointer
(
context
->
h
,
li
.
u
.
LowPart
,
&
li
.
u
.
HighPart
,
FILE_BEGIN
);
&
li
.
u
.
HighPart
,
FILE_BEGIN
);
}
else
{
}
else
{
WCMD_output_asis
(
WCMD_LoadMessage
(
WCMD_CALLINSCRIPT
));
WCMD_output_asis
_stderr
(
WCMD_LoadMessage
(
WCMD_CALLINSCRIPT
));
}
}
}
}
}
}
programs/cmd/builtins.c
View file @
9c616563
...
@@ -524,7 +524,7 @@ void WCMD_create_dir (WCHAR *command) {
...
@@ -524,7 +524,7 @@ void WCMD_create_dir (WCHAR *command) {
WCHAR
*
argN
=
command
;
WCHAR
*
argN
=
command
;
if
(
param1
[
0
]
==
0x00
)
{
if
(
param1
[
0
]
==
0x00
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
return
;
return
;
}
}
/* Loop through all args */
/* Loop through all args */
...
@@ -575,7 +575,7 @@ static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) {
...
@@ -575,7 +575,7 @@ static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) {
case
'S'
:
mask
=
FILE_ATTRIBUTE_SYSTEM
;
break
;
case
'S'
:
mask
=
FILE_ATTRIBUTE_SYSTEM
;
break
;
case
'A'
:
mask
=
FILE_ATTRIBUTE_ARCHIVE
;
break
;
case
'A'
:
mask
=
FILE_ATTRIBUTE_ARCHIVE
;
break
;
default:
default:
WCMD_output
(
WCMD_LoadMessage
(
WCMD_SYNTAXERR
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_SYNTAXERR
));
}
}
if
(
negate
)
if
(
negate
)
*
wantClear
|=
mask
;
*
wantClear
|=
mask
;
...
@@ -843,14 +843,14 @@ BOOL WCMD_delete (WCHAR *command) {
...
@@ -843,14 +843,14 @@ BOOL WCMD_delete (WCHAR *command) {
found
=
WCMD_delete_one
(
thisArg
);
found
=
WCMD_delete_one
(
thisArg
);
if
(
!
found
)
{
if
(
!
found
)
{
errorlevel
=
1
;
errorlevel
=
1
;
WCMD_output
(
WCMD_LoadMessage
(
WCMD_FILENOTFOUND
),
thisArg
);
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_FILENOTFOUND
),
thisArg
);
}
}
foundAny
|=
found
;
foundAny
|=
found
;
}
}
/* Handle no valid args */
/* Handle no valid args */
if
(
!
argsProcessed
)
if
(
!
argsProcessed
)
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
return
foundAny
;
return
foundAny
;
}
}
...
@@ -1380,7 +1380,7 @@ void WCMD_goto (CMD_LIST **cmdList) {
...
@@ -1380,7 +1380,7 @@ void WCMD_goto (CMD_LIST **cmdList) {
static
const
WCHAR
eofW
[]
=
{
':'
,
'e'
,
'o'
,
'f'
,
'\0'
};
static
const
WCHAR
eofW
[]
=
{
':'
,
'e'
,
'o'
,
'f'
,
'\0'
};
if
(
param1
[
0
]
==
0x00
)
{
if
(
param1
[
0
]
==
0x00
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
return
;
return
;
}
}
...
@@ -1408,7 +1408,7 @@ void WCMD_goto (CMD_LIST **cmdList) {
...
@@ -1408,7 +1408,7 @@ void WCMD_goto (CMD_LIST **cmdList) {
if
(
lstrcmpiW
(
current
,
paramStart
)
==
0
)
return
;
if
(
lstrcmpiW
(
current
,
paramStart
)
==
0
)
return
;
}
}
}
}
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOTARGET
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOTARGET
));
}
}
return
;
return
;
}
}
...
@@ -1568,7 +1568,7 @@ void WCMD_move (void) {
...
@@ -1568,7 +1568,7 @@ void WCMD_move (void) {
WCHAR
ext
[
MAX_PATH
];
WCHAR
ext
[
MAX_PATH
];
if
(
param1
[
0
]
==
0x00
)
{
if
(
param1
[
0
]
==
0x00
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
return
;
return
;
}
}
...
@@ -1760,7 +1760,7 @@ void WCMD_remove_dir (WCHAR *command) {
...
@@ -1760,7 +1760,7 @@ void WCMD_remove_dir (WCHAR *command) {
/* Handle no valid args */
/* Handle no valid args */
if
(
argsProcessed
==
0
)
{
if
(
argsProcessed
==
0
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
return
;
return
;
}
}
...
@@ -1789,7 +1789,7 @@ void WCMD_rename (void) {
...
@@ -1789,7 +1789,7 @@ void WCMD_rename (void) {
/* Must be at least two args */
/* Must be at least two args */
if
(
param1
[
0
]
==
0x00
||
param2
[
0
]
==
0x00
)
{
if
(
param1
[
0
]
==
0x00
||
param2
[
0
]
==
0x00
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
errorlevel
=
1
;
errorlevel
=
1
;
return
;
return
;
}
}
...
@@ -2256,7 +2256,7 @@ void WCMD_setshow_env (WCHAR *s) {
...
@@ -2256,7 +2256,7 @@ void WCMD_setshow_env (WCHAR *s) {
/* If no parameter, or no '=' sign, return an error */
/* If no parameter, or no '=' sign, return an error */
if
(
!
(
*
s
)
||
((
p
=
strchrW
(
s
,
'='
))
==
NULL
))
{
if
(
!
(
*
s
)
||
((
p
=
strchrW
(
s
,
'='
))
==
NULL
))
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
return
;
return
;
}
}
...
@@ -2284,7 +2284,7 @@ void WCMD_setshow_env (WCHAR *s) {
...
@@ -2284,7 +2284,7 @@ void WCMD_setshow_env (WCHAR *s) {
if
(
p
==
NULL
)
{
if
(
p
==
NULL
)
{
env
=
GetEnvironmentStringsW
();
env
=
GetEnvironmentStringsW
();
if
(
WCMD_setshow_sortenv
(
env
,
s
)
==
0
)
{
if
(
WCMD_setshow_sortenv
(
env
,
s
)
==
0
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_MISSINGENV
),
s
);
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_MISSINGENV
),
s
);
errorlevel
=
1
;
errorlevel
=
1
;
}
}
return
;
return
;
...
@@ -2321,7 +2321,7 @@ void WCMD_setshow_path (const WCHAR *command) {
...
@@ -2321,7 +2321,7 @@ void WCMD_setshow_path (const WCHAR *command) {
WCMD_output_asis
(
newline
);
WCMD_output_asis
(
newline
);
}
}
else
{
else
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOPATH
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOPATH
));
}
}
}
}
else
{
else
{
...
@@ -2445,7 +2445,7 @@ void WCMD_type (WCHAR *command) {
...
@@ -2445,7 +2445,7 @@ void WCMD_type (WCHAR *command) {
BOOL
writeHeaders
=
FALSE
;
BOOL
writeHeaders
=
FALSE
;
if
(
param1
[
0
]
==
0x00
)
{
if
(
param1
[
0
]
==
0x00
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_NOARG
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_NOARG
));
return
;
return
;
}
}
...
@@ -2467,7 +2467,7 @@ void WCMD_type (WCHAR *command) {
...
@@ -2467,7 +2467,7 @@ void WCMD_type (WCHAR *command) {
FILE_ATTRIBUTE_NORMAL
,
NULL
);
FILE_ATTRIBUTE_NORMAL
,
NULL
);
if
(
h
==
INVALID_HANDLE_VALUE
)
{
if
(
h
==
INVALID_HANDLE_VALUE
)
{
WCMD_print_error
();
WCMD_print_error
();
WCMD_output
(
WCMD_LoadMessage
(
WCMD_READFAIL
),
thisArg
);
WCMD_output
(
WCMD_LoadMessage
(
WCMD_READFAIL
),
thisArg
);
/* should be _stderr */
errorlevel
=
1
;
errorlevel
=
1
;
}
else
{
}
else
{
if
(
writeHeaders
)
{
if
(
writeHeaders
)
{
...
@@ -2570,7 +2570,7 @@ void WCMD_more (WCHAR *command) {
...
@@ -2570,7 +2570,7 @@ void WCMD_more (WCHAR *command) {
FILE_ATTRIBUTE_NORMAL
,
NULL
);
FILE_ATTRIBUTE_NORMAL
,
NULL
);
if
(
h
==
INVALID_HANDLE_VALUE
)
{
if
(
h
==
INVALID_HANDLE_VALUE
)
{
WCMD_print_error
();
WCMD_print_error
();
WCMD_output
(
WCMD_LoadMessage
(
WCMD_READFAIL
),
thisArg
);
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_READFAIL
),
thisArg
);
errorlevel
=
1
;
errorlevel
=
1
;
}
else
{
}
else
{
ULONG64
curPos
=
0
;
ULONG64
curPos
=
0
;
...
@@ -2626,7 +2626,7 @@ void WCMD_verify (const WCHAR *command) {
...
@@ -2626,7 +2626,7 @@ void WCMD_verify (const WCHAR *command) {
verify_mode
=
FALSE
;
verify_mode
=
FALSE
;
return
;
return
;
}
}
else
WCMD_output
(
WCMD_LoadMessage
(
WCMD_VERIFYERR
));
else
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_VERIFYERR
));
}
}
/****************************************************************************
/****************************************************************************
...
@@ -2667,7 +2667,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path)
...
@@ -2667,7 +2667,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path)
else
{
else
{
static
const
WCHAR
fmt
[]
=
{
'%'
,
's'
,
'\\'
,
'\0'
};
static
const
WCHAR
fmt
[]
=
{
'%'
,
's'
,
'\\'
,
'\0'
};
if
((
path
[
1
]
!=
':'
)
||
(
strlenW
(
path
)
!=
2
))
{
if
((
path
[
1
]
!=
':'
)
||
(
strlenW
(
path
)
!=
2
))
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_SYNTAXERR
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_SYNTAXERR
));
return
0
;
return
0
;
}
}
wsprintfW
(
curdir
,
fmt
,
path
);
wsprintfW
(
curdir
,
fmt
,
path
);
...
@@ -2916,7 +2916,7 @@ void WCMD_color (void) {
...
@@ -2916,7 +2916,7 @@ void WCMD_color (void) {
HANDLE
hStdOut
=
GetStdHandle
(
STD_OUTPUT_HANDLE
);
HANDLE
hStdOut
=
GetStdHandle
(
STD_OUTPUT_HANDLE
);
if
(
param1
[
0
]
!=
0x00
&&
strlenW
(
param1
)
>
2
)
{
if
(
param1
[
0
]
!=
0x00
&&
strlenW
(
param1
)
>
2
)
{
WCMD_output
(
WCMD_LoadMessage
(
WCMD_ARGERR
));
WCMD_output
_stderr
(
WCMD_LoadMessage
(
WCMD_ARGERR
));
return
;
return
;
}
}
...
...
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