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
828fd598
Commit
828fd598
authored
Nov 15, 2010
by
Borut Razem
Committed by
Alexandre Julliard
Nov 16, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: popen: stderr from the child process should not be redirected to the parent's stdin.
parent
d38196a0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
14 deletions
+1
-14
process.c
dlls/msvcrt/process.c
+1
-14
No files found.
dlls/msvcrt/process.c
View file @
828fd598
...
...
@@ -1031,7 +1031,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc
{
MSVCRT_FILE
*
ret
;
BOOL
readPipe
=
TRUE
;
int
textmode
,
fds
[
2
],
fdToDup
,
fdToOpen
,
fdStdHandle
=
-
1
,
fdStdErr
=
-
1
;
int
textmode
,
fds
[
2
],
fdToDup
,
fdToOpen
,
fdStdHandle
=
-
1
;
const
MSVCRT_wchar_t
*
p
;
MSVCRT_wchar_t
*
comspec
,
*
fullcmd
;
unsigned
int
len
;
...
...
@@ -1073,13 +1073,6 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc
goto
error
;
if
(
MSVCRT__dup2
(
fds
[
fdToDup
],
fdToDup
)
!=
0
)
goto
error
;
if
(
readPipe
)
{
if
((
fdStdErr
=
MSVCRT__dup
(
MSVCRT_STDERR_FILENO
))
==
-
1
)
goto
error
;
if
(
MSVCRT__dup2
(
fds
[
fdToDup
],
MSVCRT_STDERR_FILENO
)
!=
0
)
goto
error
;
}
MSVCRT__close
(
fds
[
fdToDup
]);
...
...
@@ -1106,16 +1099,10 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc
HeapFree
(
GetProcessHeap
(),
0
,
fullcmd
);
MSVCRT__dup2
(
fdStdHandle
,
fdToDup
);
MSVCRT__close
(
fdStdHandle
);
if
(
readPipe
)
{
MSVCRT__dup2
(
fdStdErr
,
MSVCRT_STDERR_FILENO
);
MSVCRT__close
(
fdStdErr
);
}
return
ret
;
error:
if
(
fdStdHandle
!=
-
1
)
MSVCRT__close
(
fdStdHandle
);
if
(
fdStdErr
!=
-
1
)
MSVCRT__close
(
fdStdErr
);
MSVCRT__close
(
fds
[
0
]);
MSVCRT__close
(
fds
[
1
]);
return
NULL
;
...
...
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