Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-26 00:54:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Opened files for redirection inheritable.

Browse source 
Printed error messages in main to stderr. If the output is redirected,
the error message isn't printed in the redirection.

svn path=/trunk/; revision=2942
This commit is contained in:
Hartmut Birr 2002-05-07 23:05:33 +00:00
parent 0e177cc7b9
commit 51b30bed9f
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
rosapps/cmd/cmd.c
View file

@ -1,4 +1,4 @@
/* $Id: cmd.c,v 1.29 2002/04/05 12:53:21 ekohl Exp $ /* $Id: cmd.c,v 1.30 2002/05/07 23:05:33 hbirr Exp $
* *
* CMD.C - command-line interface. * CMD.C - command-line interface.
* *
@ -446,8 +446,9 @@ VOID ParseCommandLine (LPTSTR cmd)
if (in[0]) if (in[0])
{ {
HANDLE hFile; HANDLE hFile;
SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
hFile = CreateFile (in, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, hFile = CreateFile (in, GENERIC_READ, FILE_SHARE_READ, &sa, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
@ -471,11 +472,13 @@ VOID ParseCommandLine (LPTSTR cmd)
while (num-- > 1) while (num-- > 1)
{ {
SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
/* Create unique temporary file name */ /* Create unique temporary file name */
GetTempFileName (szTempPath, "CMD", 0, szFileName[1]); GetTempFileName (szTempPath, "CMD", 0, szFileName[1]);
/* Set current stdout to temporary file */ /* Set current stdout to temporary file */
hFile[1] = CreateFile (szFileName[1], GENERIC_WRITE, 0, NULL, hFile[1] = CreateFile (szFileName[1], GENERIC_WRITE, 0, &sa,
TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL);
SetStdHandle (STD_OUTPUT_HANDLE, hFile[1]); SetStdHandle (STD_OUTPUT_HANDLE, hFile[1]);
@ -505,7 +508,7 @@ VOID ParseCommandLine (LPTSTR cmd)
*szFileName[1] = _T('\0'); *szFileName[1] = _T('\0');
/* open new stdin file */ /* open new stdin file */
hFile[0] = CreateFile (szFileName[0], GENERIC_READ, 0, NULL, hFile[0] = CreateFile (szFileName[0], GENERIC_READ, 0, &sa,
OPEN_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); OPEN_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL);
SetStdHandle (STD_INPUT_HANDLE, hFile[0]); SetStdHandle (STD_INPUT_HANDLE, hFile[0]);
@ -518,8 +521,9 @@ VOID ParseCommandLine (LPTSTR cmd)
{ {
/* Final output to here */ /* Final output to here */
HANDLE hFile; HANDLE hFile;
SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, NULL, hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa,
(nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
@ -560,6 +564,7 @@ VOID ParseCommandLine (LPTSTR cmd)
{ {
/* Final output to here */ /* Final output to here */
HANDLE hFile; HANDLE hFile;
SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
if (!_tcscmp (err, out)) if (!_tcscmp (err, out))
{ {
@ -576,7 +581,7 @@ VOID ParseCommandLine (LPTSTR cmd)
hFile = CreateFile (err, hFile = CreateFile (err,
GENERIC_WRITE, GENERIC_WRITE,
0, 0,
NULL, &sa,
(nRedirFlags & ERROR_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, (nRedirFlags & ERROR_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_NORMAL,
NULL); NULL);
@ -1148,7 +1153,7 @@ int main (int argc, char *argv[])
SetFileApisToOEM (); SetFileApisToOEM ();
if( GetConsoleScreenBufferInfo( GetStdHandle( STD_OUTPUT_HANDLE ), &Info ) == FALSE ) if( GetConsoleScreenBufferInfo( GetStdHandle( STD_OUTPUT_HANDLE ), &Info ) == FALSE )
printf( "GetConsoleScreenBufferInfo: Error: %ld\n", GetLastError() ); fprintf(stderr, "GetConsoleScreenBufferInfo: Error: %ld\n", GetLastError() );
wColor = Info.wAttributes; wColor = Info.wAttributes;
wDefColor = wColor; wDefColor = wColor;
/* check switches on command-line */ /* check switches on command-line */