From 5bcbde18ec84b4f3a43e15e7af6ca2cb8f564cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 10 Oct 2016 19:17:03 +0000 Subject: [PATCH] [CMD]: Fix the "TYPE" command so that it doesn't interpret the optional /P switch as a filename. svn path=/trunk/; revision=72956 --- reactos/base/shell/cmd/type.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/reactos/base/shell/cmd/type.c b/reactos/base/shell/cmd/type.c index 536578d31ae..78ccc5b789f 100644 --- a/reactos/base/shell/cmd/type.c +++ b/reactos/base/shell/cmd/type.c @@ -60,7 +60,7 @@ INT cmd_type(LPTSTR param) for (i = 0; i < argc; i++) { - if(*argv[i] == _T('/') && _tcslen(argv[i]) >= 2 && _totupper(argv[i][1]) == _T('P')) + if (argv[i][0] == _T('/') && _tcslen(argv[i]) == 2 && _totupper(argv[i][1]) == _T('P')) { bPaging = TRUE; } @@ -68,11 +68,15 @@ INT cmd_type(LPTSTR param) for (i = 0; i < argc; i++) { - if (_T('/') == argv[i][0] && _totupper(argv[i][1]) != _T('P')) + if (argv[i][0] == _T('/') && _totupper(argv[i][1]) != _T('P')) { ConErrResPrintf(STRING_TYPE_ERROR1, argv[i] + 1); continue; } + if (argv[i][0] == _T('/') && _tcslen(argv[i]) == 2 && _totupper(argv[i][1]) == _T('P')) + { + continue; + } nErrorLevel = 0;