Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

std_output does handle the : as ms does at pipe and we have also extend it to handle >test.txt: that is not vaild on ms but it should need more code to handle the : as ms does. we can call it reactos extend at cmd

Browse source 
svn path=/trunk/; revision=16564
This commit is contained in:
Magnus Olsen 2005-07-14 19:18:37 +00:00
parent a292f28ef5
commit 98d6ba9ebf
1 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
reactos/subsys/system/cmd/cmd.c
View file

@ -641,17 +641,21 @@ VOID ParseCommandLine (LPTSTR cmd)
HANDLE hFile; HANDLE hFile;
SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
/* we need make sure the LastError msg is zero before calling CreateFile */
SetLastError(0);
/* Set up pipe for the standard input handler */
hFile = CreateFile (in, GENERIC_READ, FILE_SHARE_READ, &sa, 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)
{ {
LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, in); ConErrPrintf(szMsg, in);
return; return;
} }
if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) if (!SetStdHandle (STD_INPUT_HANDLE, hFile))
{ {
LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, in); ConErrPrintf(szMsg, in);
return; return;
@ -668,9 +672,7 @@ VOID ParseCommandLine (LPTSTR cmd)
while (num-- > 1) while (num-- > 1)
{ {
SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
/* Create unique temporary file name */ /* Create unique temporary file name */
GetTempFileName (szTempPath, _T("CMD"), 0, szFileName[1]); GetTempFileName (szTempPath, _T("CMD"), 0, szFileName[1]);
@ -682,7 +684,7 @@ VOID ParseCommandLine (LPTSTR cmd)
TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL);
if (hFile[1] == INVALID_HANDLE_VALUE) if (hFile[1] == INVALID_HANDLE_VALUE)
{ {
LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg); ConErrPrintf(szMsg);
return; return;
@ -715,6 +717,9 @@ VOID ParseCommandLine (LPTSTR cmd)
_tcscpy (szFileName[0], szFileName[1]); _tcscpy (szFileName[0], szFileName[1]);
*szFileName[1] = _T('\0'); *szFileName[1] = _T('\0');
/* we need make sure the LastError msg is zero before calling CreateFile */
SetLastError(0);
/* open new stdin file */ /* open new stdin file */
hFile[0] = CreateFile (szFileName[0], GENERIC_READ, 0, &sa, hFile[0] = CreateFile (szFileName[0], GENERIC_READ, 0, &sa,
OPEN_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); OPEN_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL);
@ -730,15 +735,37 @@ VOID ParseCommandLine (LPTSTR cmd)
/* Final output to here */ /* Final output to here */
HANDLE hFile; HANDLE hFile;
SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
/* we need make sure the LastError msg is zero before calling CreateFile */
SetLastError(0);
hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa, 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)
{ {
LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); INT size = _tcslen(out)-1;
ConErrPrintf(szMsg, out);
return; if (out[size] != _T(':'))
{
LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, out);
return;
}
out[size]=_T('\0');
hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa,
(nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE)
{
LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, out);
return;
}
} }
if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile))