[CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD...

[reactos.git] / reactos / base / shell / cmd / type.c

diff --git a/reactos/base/shell/cmd/type.c b/reactos/base/shell/cmd/type.c
index ddf6d8a..2c8955d 100644 (file)
--- a/reactos/base/shell/cmd/type.c
+++ b/reactos/base/shell/cmd/type.c
@@ -22,8 +22,8 @@
  *    19-Jan-1999 (Paolo Pantaleo <paolopan@freemail.it>)
  *        Added multiple file support (copied from y.c)
  *
- *    30-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
- *        Remove all hardcode string to En.rc
+ *    30-Apr-2005 (Magnus Olsen <magnus@greatlord.com>)
+ *        Remove all hardcoded strings in En.rc
  */
 
 #include "precomp.h"
@@ -31,110 +31,112 @@
 #ifdef INCLUDE_CMD_TYPE
 
 
-INT cmd_type (LPTSTR param)
+INT cmd_type(LPTSTR param)
 {
-       TCHAR  buff[256];
-       HANDLE hFile, hConsoleOut;
-       DWORD  dwRet;
-       INT    argc,i;
-       LPTSTR *argv;
-       LPTSTR errmsg;
-       BOOL bPaging = FALSE;
-       BOOL bFirstTime = TRUE;
-
-       hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE);
-
-       if (!_tcsncmp (param, _T("/?"), 2))
-       {
-               ConOutResPaging(TRUE,STRING_TYPE_HELP1);
-               return 0;
-       }
-
-       if (!*param)
-       {
-               error_req_param_missing ();
-               return 1;
-       }
-
-       argv = split (param, &argc, TRUE, FALSE);
-
-       for(i = 0; i < argc; i++)
-       {
-               if(*argv[i] == _T('/') && _tcslen(argv[i]) >= 2 && _totupper(argv[i][1]) == _T('P'))
-               {
-                       bPaging = TRUE;
-               }
-       }
-
-       for (i = 0; i < argc; i++)
-       {
-               if (_T('/') == argv[i][0] && _totupper(argv[i][1]) != _T('P'))
-               {
-                       ConErrResPrintf(STRING_TYPE_ERROR1, argv[i] + 1);
-                       continue;
-               }
-
-       nErrorLevel = 0;
-
-               hFile = CreateFile(argv[i],
-                       GENERIC_READ,
-                       FILE_SHARE_READ,NULL,
-                       OPEN_EXISTING,
-                       FILE_ATTRIBUTE_NORMAL,NULL);
-
-               if(hFile == INVALID_HANDLE_VALUE)
-               {
-                       FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                                      FORMAT_MESSAGE_IGNORE_INSERTS |
-                                      FORMAT_MESSAGE_FROM_SYSTEM,
-                                      NULL,
-                                      GetLastError(),
-                                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                                      (LPTSTR) &errmsg,
-                                      0,
-                                      NULL);
-                       ConErrPrintf (_T("%s - %s"), argv[i], errmsg);
-                       LocalFree (errmsg);
-                       nErrorLevel = 1;
-                       continue;
-               }
-
-               if (bPaging)
-               {
-                       while (FileGetString (hFile, buff, sizeof(buff) / sizeof(TCHAR)))
-                       {
-                               if (ConOutPrintfPaging(bFirstTime, _T("%s"), buff) == 1)
-                               {
-                                       bCtrlBreak = FALSE;
-                                       CloseHandle(hFile);
-                                       freep(argv);
-                                       return 0;
-                               }
-                               bFirstTime = FALSE;
-                       }
-               }
-               else
-               {
-                       while (ReadFile(hFile, buff, sizeof(buff), &dwRet, NULL) && dwRet > 0)
-                       {
-                               WriteFile(hConsoleOut, buff, dwRet, &dwRet, NULL);
-                               if (bCtrlBreak)
-                               {
-                                       bCtrlBreak = FALSE;
-                                       CloseHandle(hFile);
-                                       freep(argv);
-                                       return 0;
-                               }
-                       }
-               }
-
-               ConOutPuts(_T("\n"));
-               CloseHandle(hFile);
-       }
-
-       freep (argv);
-
-       return 0;
+    TCHAR  buff[256];
+    HANDLE hFile, hConsoleOut;
+    DWORD  dwRet;
+    INT    argc,i;
+    LPTSTR *argv;
+    LPTSTR errmsg;
+    BOOL bPaging = FALSE;
+    BOOL bFirstTime = TRUE;
+
+    hConsoleOut = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    if (!_tcsncmp(param, _T("/?"), 2))
+    {
+        ConOutResPaging(TRUE,STRING_TYPE_HELP1);
+        return 0;
+    }
+
+    if (!*param)
+    {
+        error_req_param_missing();
+        return 1;
+    }
+
+    argv = split(param, &argc, TRUE, FALSE);
+
+    for (i = 0; i < argc; i++)
+    {
+        if (argv[i][0] == _T('/') && _tcslen(argv[i]) == 2 && _totupper(argv[i][1]) == _T('P'))
+        {
+            bPaging = TRUE;
+        }
+    }
+
+    for (i = 0; i < argc; i++)
+    {
+        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;
+
+        hFile = CreateFile(argv[i],
+                           GENERIC_READ,
+                           FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+                           OPEN_EXISTING,
+                           FILE_ATTRIBUTE_NORMAL, NULL);
+
+        if (hFile == INVALID_HANDLE_VALUE)
+        {
+            FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                           FORMAT_MESSAGE_IGNORE_INSERTS |
+                           FORMAT_MESSAGE_FROM_SYSTEM,
+                           NULL,
+                           GetLastError(),
+                           MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                           (LPTSTR) &errmsg,
+                           0,
+                           NULL);
+            ConErrPrintf (_T("%s - %s"), argv[i], errmsg);
+            LocalFree (errmsg);
+            nErrorLevel = 1;
+            continue;
+        }
+
+        if (bPaging)
+        {
+            while (FileGetString(hFile, buff, ARRAYSIZE(buff)))
+            {
+                if (!ConOutPrintfPaging(bFirstTime, _T("%s"), buff))
+                {
+                    bCtrlBreak = FALSE;
+                    CloseHandle(hFile);
+                    freep(argv);
+                    return 0;
+                }
+                bFirstTime = FALSE;
+            }
+        }
+        else
+        {
+            while (ReadFile(hFile, buff, sizeof(buff), &dwRet, NULL) && dwRet > 0)
+            {
+                WriteFile(hConsoleOut, buff, dwRet, &dwRet, NULL);
+                if (bCtrlBreak)
+                {
+                    bCtrlBreak = FALSE;
+                    CloseHandle(hFile);
+                    freep(argv);
+                    return 0;
+                }
+            }
+        }
+
+        CloseHandle(hFile);
+    }
+
+    freep(argv);
+    return 0;
 }
 
 #endif