ShellPkg: Clean up source files

1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

17 files changed, 200 insertions, 200 deletions

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c
index 30d643431f..03a99591aa 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c
@@ -2,7 +2,7 @@
   Main file for attrib shell level 2 function.

 

   (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -70,7 +70,7 @@ ShellCommandRunAttrib (
   Status = ShellCommandLineParse (AttribParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"attrib", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"attrib", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -133,7 +133,7 @@ ShellCommandRunAttrib (
           ASSERT(ListOfFiles == NULL);

           Status = ShellOpenFileMetaArg((CHAR16*)FileName, EFI_FILE_MODE_READ, &ListOfFiles);

           if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

             ShellStatus = SHELL_NOT_FOUND;

           } else {

             for (FileNode = (EFI_SHELL_FILE_INFO*)GetFirstNode(&ListOfFiles->Link)

@@ -153,7 +153,7 @@ ShellCommandRunAttrib (
                 FileNode->Info->Attribute&EFI_FILE_READ_ONLY? L'R':L' ',

                 FileNode->FileName

                );

-               

+

               if (ShellGetExecutionBreakFlag()) {

                   ShellStatus = SHELL_ABORTED;

                   break;

@@ -162,7 +162,7 @@ ShellCommandRunAttrib (
             Status = ShellCloseFileMetaArg(&ListOfFiles);

             ListOfFiles = NULL;

             if (EFI_ERROR(Status)) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

               ShellStatus = SHELL_NOT_FOUND;

             }

           } // for loop for handling wildcard filenames

@@ -171,7 +171,7 @@ ShellCommandRunAttrib (
         //

         // fail as we have conflcting params.

         //

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"attrib");  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"attrib");

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         //

@@ -188,7 +188,7 @@ ShellCommandRunAttrib (
             // make sure we are not failing on the first one we do... if yes that's an error...

             //

             if (ParamNumberCount == 1) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"attrib");  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"attrib");

               ShellStatus = SHELL_INVALID_PARAMETER;

             }

             break;

@@ -205,7 +205,7 @@ ShellCommandRunAttrib (
           ASSERT(ListOfFiles == NULL);

           Status = ShellOpenFileMetaArg((CHAR16*)FileName, EFI_FILE_MODE_READ, &ListOfFiles);

           if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

             ShellStatus = SHELL_NOT_FOUND;

           } else {

             for (FileNode = (EFI_SHELL_FILE_INFO*)GetFirstNode(&ListOfFiles->Link)

@@ -231,7 +231,7 @@ ShellCommandRunAttrib (
                 //

                 Status = ShellSetFileInfo(FileNode->Handle, FileInfo);

                 if (EFI_ERROR(Status)) {

-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));  

+                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

                   ShellStatus = SHELL_ACCESS_DENIED;

                 }

               }

@@ -247,7 +247,7 @@ ShellCommandRunAttrib (
               //

               Status = ShellSetFileInfo(FileNode->Handle, FileInfo);

               if (EFI_ERROR(Status)) {;

-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));  

+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

                 ShellStatus = SHELL_ACCESS_DENIED;

               }

 

@@ -256,7 +256,7 @@ ShellCommandRunAttrib (
             Status = ShellCloseFileMetaArg(&ListOfFiles);

             ListOfFiles = NULL;

             if (EFI_ERROR(Status)) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

               ShellStatus = SHELL_NOT_FOUND;

             }

           } // for loop for handling wildcard filenames

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
index d5dc9804d4..79dd2096f4 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
@@ -217,7 +217,7 @@ ShellCommandRunCd (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"cd", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"cd", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -231,7 +231,7 @@ ShellCommandRunCd (
   if (ShellCommandLineGetFlag(Package, L"-?")) {

     ASSERT(FALSE);

   } else if (ShellCommandLineGetRawValue(Package, 2) != NULL) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"cd");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"cd");

     ShellStatus = SHELL_INVALID_PARAMETER;

   } else {

     //

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index ae7528ddcf..1c48824664 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -132,7 +132,7 @@ CopySingleFile(
   if (ShellIsDirectory(Source) == EFI_SUCCESS) {

     Status = ShellCreateDirectory(Dest, &DestHandle);

     if (EFI_ERROR(Status)) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DEST_DIR_FAIL), gShellLevel2HiiHandle, CmdName, Dest);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DEST_DIR_FAIL), gShellLevel2HiiHandle, CmdName, Dest);

       return (SHELL_ACCESS_DENIED);

     }

 

@@ -161,7 +161,7 @@ CopySingleFile(
     //

     Status = ShellOpenFileByName(Dest, &DestHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);

     if (EFI_ERROR(Status)) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DEST_OPEN_FAIL), gShellLevel2HiiHandle, CmdName, Dest);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DEST_OPEN_FAIL), gShellLevel2HiiHandle, CmdName, Dest);

       return (SHELL_ACCESS_DENIED);

     }

 

@@ -220,7 +220,7 @@ CopySingleFile(
       //not enough space on destination directory to copy file

       //

       SHELL_FREE_NON_NULL(DestVolumeInfo);

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_FAIL), gShellLevel2HiiHandle, CmdName);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_FAIL), gShellLevel2HiiHandle, CmdName);

       return(SHELL_VOLUME_FULL);

     } else {

       //

@@ -237,19 +237,19 @@ CopySingleFile(
           Status = ShellWriteFile(DestHandle, &ReadSize, Buffer);

           if (EFI_ERROR(Status)) {

             ShellStatus = (SHELL_STATUS) (Status & (~MAX_BIT));

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_WRITE_ERROR), gShellLevel2HiiHandle, CmdName, Dest);   

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_WRITE_ERROR), gShellLevel2HiiHandle, CmdName, Dest);

             break;

           }

         } else {

           ShellStatus = (SHELL_STATUS) (Status & (~MAX_BIT));

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_READ_ERROR), gShellLevel2HiiHandle, CmdName, Source);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_READ_ERROR), gShellLevel2HiiHandle, CmdName, Source);

           break;

         }

       }

     }

     SHELL_FREE_NON_NULL(DestVolumeInfo);

   }

-  

+

   //

   // close files

   //

@@ -324,7 +324,7 @@ ValidateAndCopyFiles(
   ASSERT(FileList != NULL);

   ASSERT(DestDir  != NULL);

 

-  

+

   Status = ShellLevel2StripQuotes (DestDir, &CleanFilePathStr);

   if (EFI_ERROR (Status)) {

     if (Status == EFI_OUT_OF_RESOURCES) {

@@ -333,7 +333,7 @@ ValidateAndCopyFiles(
       return SHELL_INVALID_PARAMETER;

     }

   }

-  

+

   ASSERT (CleanFilePathStr != NULL);

 

   //

@@ -343,7 +343,7 @@ ValidateAndCopyFiles(
     //

     // Error for destination not a directory

     //

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_DIR), gShellLevel2HiiHandle, L"cp", CleanFilePathStr); 

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_DIR), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);

     FreePool (CleanFilePathStr);

     return (SHELL_INVALID_PARAMETER);

   }

@@ -369,7 +369,7 @@ ValidateAndCopyFiles(
     // Make sure got -r if required

     //

     if (!RecursiveMode && !EFI_ERROR(ShellIsDirectory(Node->FullName))) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DIR_REQ), gShellLevel2HiiHandle, L"cp");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DIR_REQ), gShellLevel2HiiHandle, L"cp");

       FreePool (CleanFilePathStr);

       return (SHELL_INVALID_PARAMETER);

     }

@@ -381,7 +381,7 @@ ValidateAndCopyFiles(
       //

       // Error for destination not a directory

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_DIR), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_DIR), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);

       FreePool (CleanFilePathStr);

       return (SHELL_INVALID_PARAMETER);

     }

@@ -430,7 +430,7 @@ ValidateAndCopyFiles(
           StrCpyS(DestPath, PathSize / sizeof(CHAR16), Cwd);

           StrCatS(DestPath, PathSize / sizeof(CHAR16), L"\\");

         } else {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);

           FreePool (CleanFilePathStr);

           return (SHELL_INVALID_PARAMETER);

         }

@@ -447,7 +447,7 @@ ValidateAndCopyFiles(
       //

       // we have multiple files or a directory in the DestDir

       //

-      

+

       //

       // Check for leading slash

       //

@@ -459,7 +459,7 @@ ValidateAndCopyFiles(
           StrCpyS(DestPath, PathSize/sizeof(CHAR16), Cwd);

           StrCatS(DestPath, PathSize/sizeof(CHAR16), L"\\");

         } else {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp",  CleanFilePathStr); 

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp",  CleanFilePathStr);

           FreePool(CleanFilePathStr);

           return (SHELL_INVALID_PARAMETER);

         }

@@ -471,7 +471,7 @@ ValidateAndCopyFiles(
           StrCpyS(DestPath, PathSize/sizeof(CHAR16), Cwd);

           StrCatS(DestPath, PathSize/sizeof(CHAR16), L"\\");

         } else {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);

           FreePool(CleanFilePathStr);

           return (SHELL_INVALID_PARAMETER);

         }

@@ -498,12 +498,12 @@ ValidateAndCopyFiles(
         StrCatS(DestPath, PathSize/sizeof(CHAR16), Node->FileName);

       }

     }

-    

+

     //

     // Make sure the path exists

     //

     if (EFI_ERROR(VerifyIntermediateDirectories(DestPath))) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DIR_WNF), gShellLevel2HiiHandle, L"cp", DestPath);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DIR_WNF), gShellLevel2HiiHandle, L"cp", DestPath);

       ShellStatus = SHELL_DEVICE_ERROR;

       break;

     }

@@ -512,12 +512,12 @@ ValidateAndCopyFiles(
       && !EFI_ERROR(ShellIsDirectory(DestPath))

       && StrniCmp(Node->FullName, DestPath, StrLen(DestPath)) == 0

       ){

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_SD_PARENT), gShellLevel2HiiHandle, L"cp");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_SD_PARENT), gShellLevel2HiiHandle, L"cp");

       ShellStatus = SHELL_INVALID_PARAMETER;

       break;

     }

     if (StringNoCaseCompare(&Node->FullName, &DestPath) == 0) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_SD_SAME), gShellLevel2HiiHandle, L"cp");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_SD_SAME), gShellLevel2HiiHandle, L"cp");

       ShellStatus = SHELL_INVALID_PARAMETER;

       break;

     }

@@ -525,7 +525,7 @@ ValidateAndCopyFiles(
     if ((StrniCmp(Node->FullName, DestPath, StrLen(Node->FullName)) == 0)

       && (DestPath[StrLen(Node->FullName)] == CHAR_NULL || DestPath[StrLen(Node->FullName)] == L'\\')

       ) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_SD_SAME), gShellLevel2HiiHandle, L"cp");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_SD_SAME), gShellLevel2HiiHandle, L"cp");

       ShellStatus = SHELL_INVALID_PARAMETER;

       break;

     }

@@ -561,7 +561,7 @@ ValidateAndCopyFiles(
 }

 

 /**

-  Validate and if successful copy all the files from the list into 

+  Validate and if successful copy all the files from the list into

   destination directory.

 

   @param[in] FileList       The list of files to copy.

@@ -591,7 +591,7 @@ ProcessValidateAndCopyFiles(
 

   ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_READ, &List);

   if (List != NULL && List->Link.ForwardLink != List->Link.BackLink) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MARG_ERROR), gShellLevel2HiiHandle, L"cp", DestDir);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MARG_ERROR), gShellLevel2HiiHandle, L"cp", DestDir);

     ShellStatus = SHELL_INVALID_PARAMETER;

     ShellCloseFileMetaArg(&List);

   } else if (List != NULL) {

@@ -604,7 +604,7 @@ ProcessValidateAndCopyFiles(
     if ((FileInfo->Attribute & EFI_FILE_READ_ONLY) == 0) {

       ShellStatus = ValidateAndCopyFiles(FileList, FullName, SilentMode, RecursiveMode, NULL);

     } else {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DEST_ERROR), gShellLevel2HiiHandle, L"cp");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DEST_ERROR), gShellLevel2HiiHandle, L"cp");

       ShellStatus = SHELL_ACCESS_DENIED;

     }

   } else {

@@ -668,7 +668,7 @@ ShellCommandRunCp (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"cp", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"cp", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -698,7 +698,7 @@ ShellCommandRunCp (
         //

         // we have insufficient parameters

         //

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"cp");  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"cp");

         ShellStatus = SHELL_INVALID_PARAMETER;

         break;

       case 2:

@@ -707,12 +707,12 @@ ShellCommandRunCp (
         //

         Cwd = ShellGetCurrentDir(NULL);

         if (Cwd == NULL){

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"cp");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"cp");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           Status = ShellOpenFileMetaArg((CHAR16*)ShellCommandLineGetRawValue(Package, 1), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);

           if (FileList == NULL || IsListEmpty(&FileList->Link) || EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, 1));  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, 1));

             ShellStatus = SHELL_NOT_FOUND;

           } else  {

             FullCwd = AllocateZeroPool(StrSize(Cwd) + sizeof(CHAR16));

@@ -738,7 +738,7 @@ ShellCommandRunCp (
           }

           Status = ShellOpenFileMetaArg((CHAR16*)ShellCommandLineGetRawValue(Package, LoopCounter), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);

           if (EFI_ERROR(Status) || FileList == NULL || IsListEmpty(&FileList->Link)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, LoopCounter));  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, LoopCounter));

             ShellStatus = SHELL_NOT_FOUND;

           }

         }

@@ -752,7 +752,7 @@ ShellCommandRunCp (
             ShellStatus = ProcessValidateAndCopyFiles(FileList, PathCleanUpDirectories((CHAR16*)ShellCommandLineGetRawValue(Package, ParamCount)), SilentMode, RecursiveMode);

             Status = ShellCloseFileMetaArg(&FileList);

             if (EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_FILE), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, ParamCount), ShellStatus|MAX_BIT);  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_FILE), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, ParamCount), ShellStatus|MAX_BIT);

               ShellStatus = SHELL_ACCESS_DENIED;

             }

           }

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
index 322d510eac..151df00071 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
@@ -2,7 +2,7 @@
   Main file for attrib shell level 2 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -212,7 +212,7 @@ ShellCommandRunLoad (
   Status = ShellCommandLineParse (LoadParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"load", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"load", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -228,7 +228,7 @@ ShellCommandRunLoad (
       //

       // we didnt get a single file to load parameter

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"load");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"load");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       for ( ParamCount = 1

@@ -259,7 +259,7 @@ ShellCommandRunLoad (
           //

           // no files found.

           //

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"load", (CHAR16*)ShellCommandLineGetRawValue(Package, ParamCount));  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"load", (CHAR16*)ShellCommandLineGetRawValue(Package, ParamCount));

           ShellStatus = SHELL_NOT_FOUND;

         }

       } // for loop for params

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 7d2e15f520..3c8ec78135 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -2,7 +2,7 @@
   Main file for ls shell level 2 function.

 

   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -154,10 +154,10 @@ PrintSfoVolumeInfoTableEntry(
 **/

 VOID

 PrintFileInformation(

-  IN CONST BOOLEAN              Sfo, 

-  IN CONST EFI_SHELL_FILE_INFO  *TheNode, 

-  IN UINT64                     *Files, 

-  IN UINT64                     *Size, 

+  IN CONST BOOLEAN              Sfo,

+  IN CONST EFI_SHELL_FILE_INFO  *TheNode,

+  IN UINT64                     *Files,

+  IN UINT64                     *Size,

   IN UINT64                     *Dirs

   )

 {

@@ -300,8 +300,8 @@ PrintNonSfoHeader(
 **/

 VOID

 PrintNonSfoFooter(

-  IN UINT64                     Files, 

-  IN UINT64                     Size, 

+  IN UINT64                     Files,

+  IN UINT64                     Size,

   IN UINT64                     Dirs

   )

 {

@@ -370,7 +370,7 @@ FileTimeToLocalTime (
   //

   HourNumberOfTempMinute = TempMinute / 60;

   if(TempMinute < 0) {

-    HourNumberOfTempMinute --; 

+    HourNumberOfTempMinute --;

   }

   TempHour = Time->Hour + HourNumberOfTempMinute;

   Time->Minute = (UINT8)(TempMinute - 60 * HourNumberOfTempMinute);

@@ -582,7 +582,7 @@ PrintLsOutput(
     }

     CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, L"*",     0);

     Status = ShellOpenFileMetaArg((CHAR16*)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);

-   

+

     if (!EFI_ERROR(Status)) {

       for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)

           ; !IsNull(&ListHead->Link, &Node->Link) && ShellStatus == SHELL_SUCCESS

@@ -609,7 +609,7 @@ PrintLsOutput(
             &FoundOne,

             Count,

             TimeZone);

-            

+

           //

           // Since it's running recursively, we have to break immediately when returned SHELL_ABORTED

           //

@@ -698,7 +698,7 @@ ShellCommandRunLs (
   Status = ShellCommandLineParse (LsParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"ls", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"ls", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -713,7 +713,7 @@ ShellCommandRunLs (
     }

 

     if (ShellCommandLineGetCount(Package) > 2) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"ls");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"ls");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       //

@@ -751,7 +751,7 @@ ShellCommandRunLs (
               Count++;

               continue;

             default:

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ATTRIBUTE), gShellLevel2HiiHandle, L"ls", ShellCommandLineGetValue(Package, L"-a"));  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ATTRIBUTE), gShellLevel2HiiHandle, L"ls", ShellCommandLineGetValue(Package, L"-a"));

               ShellStatus = SHELL_INVALID_PARAMETER;

               break;

           } // switch

@@ -772,7 +772,7 @@ ShellCommandRunLs (
           CurDir = gEfiShellProtocol->GetCurDir(NULL);

           if (CurDir == NULL) {

             ShellStatus = SHELL_NOT_FOUND;

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");

           }

           //

           // Copy to the 2 strings for starting path and file search string

@@ -789,7 +789,7 @@ ShellCommandRunLs (
             // If we got something and it doesnt have a fully qualified path, then we needed to have a CWD.

             //

             ShellStatus = SHELL_NOT_FOUND;

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");

           } else {

             //

             // We got a valid fully qualified path or we have a CWD

@@ -809,7 +809,7 @@ ShellCommandRunLs (
                 ShellCommandLineFreeVarList (Package);

                 return SHELL_OUT_OF_RESOURCES;

             }

-               

+

             if  (ShellIsDirectory(PathName) == EFI_SUCCESS) {

               //

               // is listing ends with a directory, then we list all files in that directory

@@ -832,7 +832,7 @@ ShellCommandRunLs (
         }

         Status = gRT->GetTime(&TheTime, NULL);

         if (EFI_ERROR(Status)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"ls", L"gRT->GetTime", Status);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"ls", L"gRT->GetTime", Status);

           TheTime.TimeZone = EFI_UNSPECIFIED_TIMEZONE;

         }

 

@@ -848,15 +848,15 @@ ShellCommandRunLs (
             TheTime.TimeZone

            );

           if (ShellStatus == SHELL_NOT_FOUND) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_LS_FILE_NOT_FOUND), gShellLevel2HiiHandle, L"ls", FullPath);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_LS_FILE_NOT_FOUND), gShellLevel2HiiHandle, L"ls", FullPath);

           } else if (ShellStatus == SHELL_INVALID_PARAMETER) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);

           } else if (ShellStatus == SHELL_ABORTED) {

             //

             // Ignore aborting.

             //

           } else if (ShellStatus != SHELL_SUCCESS) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);

           }

         }

       }

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 9166ca2205..9cc6014805 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -4,7 +4,7 @@
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>

   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

-  

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -56,12 +56,12 @@ IsNumberLetterOnly(
 

   @param[in] List         The list to seatch in.

   @param[in] MetaTarget   The item to search for. MetaMatching supported.

-  @param[out] FullName    Optional pointer to an allocated buffer containing 

+  @param[out] FullName    Optional pointer to an allocated buffer containing

                           the match.

   @param[in] Meta         TRUE to use MetaMatching.

   @param[in] SkipTrailingNumbers  TRUE to allow for numbers after the MetaTarget.

-  @param[in] Target       The single character that delimits list 

-                          items (";" normally). 

+  @param[in] Target       The single character that delimits list

+                          items (";" normally).

 **/

 BOOLEAN

 SearchList(

@@ -119,7 +119,7 @@ SearchList(
 }

 

 /**

-  Determine what type of device is represented and return it's string.  The 

+  Determine what type of device is represented and return it's string.  The

   string is in allocated memory and must be callee freed.  The HII is is listed below.

   The actual string cannot be determined.

 

@@ -223,7 +223,7 @@ MappingListHasType(
   CHAR16              *NewSpecific;

   RETURN_STATUS       Status;

   UINTN               Length;

-  

+

   //

   // specific has priority

   //

@@ -529,7 +529,7 @@ PerformMappingDisplay(
   BOOLEAN                   Found;

 

   if (!Consist && !Normal && Specific == NULL && TypeString == NULL) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");

     return (SHELL_INVALID_PARAMETER);

   }

 

@@ -540,7 +540,7 @@ PerformMappingDisplay(
       if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {

         Test = (CHAR16*)Fp;

         if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", TypeString);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", TypeString);

           return (SHELL_INVALID_PARAMETER);

         }

       } else if (Test == NULL) {

@@ -665,9 +665,9 @@ PerformMappingDisplay(
   }

   if (!Found) {

     if (Specific != NULL) {

-      ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", Specific);  

+      ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", Specific);

     } else {

-      ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle, L"map");  

+      ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle, L"map");

     }

   }

   return (SHELL_SUCCESS);

@@ -879,7 +879,7 @@ AddMappingFromMapping(
   EFI_STATUS                      Status;

   CHAR16                          *NewSName;

   RETURN_STATUS                   StrRetStatus;

-  

+

   NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);

   if (NewSName == NULL) {

     return (SHELL_OUT_OF_RESOURCES);

@@ -935,7 +935,7 @@ AddMappingFromHandle(
   EFI_STATUS                Status;

   CHAR16                    *NewSName;

   RETURN_STATUS             StrRetStatus;

-  

+

   NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);

   if (NewSName == NULL) {

     return (SHELL_OUT_OF_RESOURCES);

@@ -1084,7 +1084,7 @@ ShellCommandRunMap (
   Status = ShellCommandLineParse (MapParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"map", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"map", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -1100,7 +1100,7 @@ ShellCommandRunMap (
     if (ShellCommandLineGetFlag(Package, L"-?")) {

       ASSERT(FALSE);

     } else if (ShellCommandLineGetRawValue(Package, 3) != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"map");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"map");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       //

@@ -1114,7 +1114,7 @@ ShellCommandRunMap (
           || ShellCommandLineGetFlag(Package, L"-u")

           || ShellCommandLineGetFlag(Package, L"-t")

          ){

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"map");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"map");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           SName = ShellCommandLineGetValue(Package, L"-d");

@@ -1122,18 +1122,18 @@ ShellCommandRunMap (
             Status = PerformMappingDelete(SName);

             if (EFI_ERROR(Status)) {

               if (Status == EFI_ACCESS_DENIED) {

-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");  

+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");

                 ShellStatus = SHELL_ACCESS_DENIED;

               } else if (Status == EFI_NOT_FOUND) {

-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", SName);  

+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", SName);

                 ShellStatus = SHELL_INVALID_PARAMETER;

               } else {

-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);  

+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);

                 ShellStatus = SHELL_UNSUPPORTED;

               }

             }

           } else {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");

             ShellStatus = SHELL_INVALID_PARAMETER;

           }

         }

@@ -1151,7 +1151,7 @@ ShellCommandRunMap (
           //

           Status = ShellCommandCreateInitialMappingsAndPaths();

           if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);

             ShellStatus = SHELL_UNSUPPORTED;

           }

         }

@@ -1161,7 +1161,7 @@ ShellCommandRunMap (
           //

           Status = ShellCommandUpdateMapping ();

           if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);

             ShellStatus = SHELL_UNSUPPORTED;

           }

         }

@@ -1241,7 +1241,7 @@ ShellCommandRunMap (
             MapAsHandle = NULL;

           }

           if (MapAsHandle == NULL && Mapping[StrLen(Mapping)-1] != L':') {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);

             ShellStatus = SHELL_INVALID_PARAMETER;

           } else {

             TempStringLength = StrLen(SName);

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
index 3a9e037d0e..21165c0ca7 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
@@ -2,7 +2,7 @@
   Main file for attrib shell level 2 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -55,7 +55,7 @@ ShellCommandRunMkDir (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mkdir", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mkdir", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -76,7 +76,7 @@ ShellCommandRunMkDir (
       //

       // we didnt get a single parameter

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mkdir");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mkdir");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       for ( DirCreateCount = 1

@@ -108,7 +108,7 @@ ShellCommandRunMkDir (
           ASSERT(FileHandle == NULL);

           //

           // create the nested directory from parent to child.

-          // if NewDirName = test1\test2\test3, first create "test1\" directory, then "test1\test2\", finally "test1\test2\test3". 

+          // if NewDirName = test1\test2\test3, first create "test1\" directory, then "test1\test2\", finally "test1\test2\test3".

           //

           NewDirNameCopy = AllocateCopyPool (StrSize(NewDirName), NewDirName);

           NewDirNameCopy = PathCleanUpDirectories (NewDirNameCopy);

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index 71e43367c6..43cd20e1bf 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -2,7 +2,7 @@
   Main file for mv shell level 2 function.

 

   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -17,7 +17,7 @@
 

 /**

   function to determine if a move is between file systems.

-  

+

   @param FullName [in]    The name of the file to move.

   @param Cwd      [in]    The current working directory

   @param DestPath [in]    The target location to move to

@@ -170,14 +170,14 @@ IsValidMove(
   //

   // invalid to move read only or move to a read only destination

   //

-  if (((Attribute & EFI_FILE_READ_ONLY) != 0) 

+  if (((Attribute & EFI_FILE_READ_ONLY) != 0)

     || (FileStatus == EFI_WRITE_PROTECTED)

     || ((DestAttr & EFI_FILE_READ_ONLY) != 0)

     ) {

     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MV_INV_RO), gShellLevel2HiiHandle, SourcePath);

     return (FALSE);

-  }  

-  

+  }

+

   DestPathCopy = AllocateCopyPool(StrSize(DestPath), DestPath);

   if (DestPathCopy == NULL) {

     return (FALSE);

@@ -196,7 +196,7 @@ IsValidMove(
   // If they're the same, or if source is "above" dest on file path tree

   //

   if ( StringNoCaseCompare (&DestPathWalker, &SourcePath) == 0 ||

-       ((StrStr(DestPathWalker, SourcePath) == DestPathWalker) && 

+       ((StrStr(DestPathWalker, SourcePath) == DestPathWalker) &&

         (DestPathWalker[StrLen(SourcePath)] == '\\')

        )

      ) {

@@ -311,7 +311,7 @@ GetDestinationLocation(
     //

     if (!IsNodeAtEnd(&DestList->Link, &Node->Link)) {

       ShellCloseFileMetaArg(&DestList);

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MARG_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MARG_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);

       return (SHELL_INVALID_PARAMETER);

     }

 

@@ -331,7 +331,7 @@ GetDestinationLocation(
       // cant move multiple files onto a single file.

       //

       ShellCloseFileMetaArg(&DestList);

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);

       return (SHELL_INVALID_PARAMETER);

     }

   }

@@ -401,7 +401,7 @@ MoveBetweenFileSystems(
 EFI_STATUS

 CreateFullDestPath(

   IN CONST CHAR16 **DestPath,

-  OUT CHAR16      **FullDestPath, 

+  OUT CHAR16      **FullDestPath,

   IN CONST CHAR16 *FileName

   )

 {

@@ -555,7 +555,7 @@ ValidateAndMoveFiles(
       StrCpyS(FullCwd, StrSize(Cwd)/sizeof(CHAR16)+1, Cwd);

       StrCatS(FullCwd, StrSize(Cwd)/sizeof(CHAR16)+1, L"\\");

     }

-  } 

+  }

 

   Status = ShellLevel2StripQuotes (DestParameter, &CleanFilePathStr);

   if (EFI_ERROR (Status)) {

@@ -757,7 +757,7 @@ ShellCommandRunMv (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mv", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mv", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -777,7 +777,7 @@ ShellCommandRunMv (
         //

         // we have insufficient parameters

         //

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mv");  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mv");

         ShellStatus = SHELL_INVALID_PARAMETER;

         break;

       case 2:

@@ -785,12 +785,12 @@ ShellCommandRunMv (
         // must have valid CWD for single parameter...

         //

         if (ShellGetCurrentDir(NULL) == NULL){

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"mv");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"mv");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           Status = ShellOpenFileMetaArg((CHAR16*)ShellCommandLineGetRawValue(Package, 1), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);

           if (FileList == NULL || IsListEmpty(&FileList->Link) || EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, 1));  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, 1));

             ShellStatus = SHELL_NOT_FOUND;

           } else  {

             //

@@ -819,7 +819,7 @@ ShellCommandRunMv (
           }

           Status = ShellOpenFileMetaArg((CHAR16*)ShellCommandLineGetRawValue(Package, LoopCounter), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);

           if (FileList == NULL || IsListEmpty(&FileList->Link) || EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, LoopCounter));  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, LoopCounter));

             ShellStatus = SHELL_NOT_FOUND;

           } else  {

             //

@@ -836,7 +836,7 @@ ShellCommandRunMv (
             Status = ShellCloseFileMetaArg(&FileList);

             if (EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS) {

               ShellStatus = SHELL_ACCESS_DENIED;

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_FILE), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, 1), ShellStatus|MAX_BIT);  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_FILE), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, 1), ShellStatus|MAX_BIT);

             }

           }

         }

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
index 85c39ba78f..798b28983d 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
@@ -2,7 +2,7 @@
   Main file for Parse shell level 2 function.

 

   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -19,9 +19,9 @@
   Check if data is coming from StdIn output.

 

   @param[in] None

- 

-  @retval TRUE  StdIn stream data available to parse 

-  @retval FALSE StdIn stream data is not available to parse. 

+

+  @retval TRUE  StdIn stream data available to parse

+  @retval FALSE StdIn stream data is not available to parse.

 **/

 BOOLEAN

 IsStdInDataAvailable (

@@ -30,11 +30,11 @@ IsStdInDataAvailable (
 {

   SHELL_FILE_HANDLE FileHandle;

   EFI_STATUS        Status;

-  CHAR16            CharBuffer; 

+  CHAR16            CharBuffer;

   UINTN             CharSize;

   UINT64            OriginalFilePosition;

 

-  Status               = EFI_SUCCESS; 

+  Status               = EFI_SUCCESS;

   FileHandle           = NULL;

   OriginalFilePosition = 0;

 

@@ -57,11 +57,11 @@ IsStdInDataAvailable (
 

 /**

   Handle stings for SFO Output with escape character ^ in a string

-  1. Quotation marks in the string must be escaped by using a ^ character (i.e. ^"). 

+  1. Quotation marks in the string must be escaped by using a ^ character (i.e. ^").

   2. The ^ character may be inserted using ^^.

 

   @param[in]  String  The Unicode NULL-terminated string.

- 

+

   @retval NewString   The new string handled for SFO.

 **/

 EFI_STRING

@@ -76,7 +76,7 @@ HandleStringWithEscapeCharForParse (
   if (String == NULL) {

     return NULL;

   }

-  

+

   //

   // start to parse the input string.

   //

@@ -96,13 +96,13 @@ HandleStringWithEscapeCharForParse (
     StrWalker++;

     NewStr++;

   }

-  

+

   return ReturnStr;

 }

 

 

 /**

-  Do the actual parsing of the file.  the file should be SFO output from a 

+  Do the actual parsing of the file.  the file should be SFO output from a

   shell command or a similar format.

 

   @param[in] FileName               The filename to open.

@@ -143,14 +143,14 @@ PerformParsing(
 

   Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ, 0);

   if (EFI_ERROR(Status)) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"parse", FileName);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"parse", FileName);

     ShellStatus = SHELL_NOT_FOUND;

   } else if (!EFI_ERROR (FileHandleIsDirectory (FileHandle))) {

-    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_FILE), gShellLevel2HiiHandle, L"parse", FileName);  

+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_FILE), gShellLevel2HiiHandle, L"parse", FileName);

     ShellStatus = SHELL_NOT_FOUND;

   } else {

     for (LoopVariable = 0 ; LoopVariable < ShellCommandInstance && !ShellFileHandleEof(FileHandle);) {

-     TempLine = ShellFileHandleReturnLine (FileHandle, &Ascii); 

+     TempLine = ShellFileHandleReturnLine (FileHandle, &Ascii);

 

       if ((TempLine == NULL) || (*TempLine == CHAR_NULL && StreamingUnicode)) {

          break;

@@ -169,7 +169,7 @@ PerformParsing(
     if (LoopVariable == ShellCommandInstance) {

       LoopVariable = 0;

       while(1) {

-        TempLine = ShellFileHandleReturnLine (FileHandle, &Ascii); 

+        TempLine = ShellFileHandleReturnLine (FileHandle, &Ascii);

         if (TempLine == NULL

             || *TempLine == CHAR_NULL

             || StrStr (TempLine, L"ShellCommand,") == TempLine) {

@@ -188,7 +188,7 @@ PerformParsing(
             }

             if (ColumnLoop == ColumnIndex) {

               if (ColumnPointer == NULL) {

-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"parse", L"Column Index");  

+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"parse", L"Column Index");

                 ShellStatus = SHELL_INVALID_PARAMETER;

               } else {

                 TempSpot = StrStr (ColumnPointer, L",\"");

@@ -266,7 +266,7 @@ ShellCommandRunParse (
   Status = ShellCommandLineParseEx (ParamList, &Package, &ProblemParam, TRUE, FALSE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"parse", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"parse", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -276,11 +276,11 @@ ShellCommandRunParse (
     StreamingUnicode = IsStdInDataAvailable ();

     if ((!StreamingUnicode && (ShellCommandLineGetCount(Package) < 4)) ||

         (ShellCommandLineGetCount(Package) < 3)) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"parse");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"parse");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if ((StreamingUnicode && (ShellCommandLineGetCount(Package) > 3)) ||

                 (ShellCommandLineGetCount(Package) > 4)) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"parse");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"parse");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       if (StreamingUnicode) {

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c
index 40ad8d9c4e..59fa6f5acd 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c
@@ -2,7 +2,7 @@
   Main file for attrib shell level 2 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -60,7 +60,7 @@ ShellCommandRunReset (
   Status = ShellCommandLineParse (ResetParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"reset", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"reset", ProblemParam);

       FreePool(ProblemParam);

       return (SHELL_INVALID_PARAMETER);

     } else {

@@ -73,7 +73,7 @@ ShellCommandRunReset (
     if (ShellCommandLineGetFlag(Package, L"-?")) {

       ASSERT(FALSE);

     } else if (ShellCommandLineGetRawValue(Package, 1) != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

 

@@ -114,7 +114,7 @@ ShellCommandRunReset (
       //

       if (ShellCommandLineGetFlag(Package, L"-w")) {

         if (ShellCommandLineGetFlag(Package, L"-s") || ShellCommandLineGetFlag(Package, L"-c")) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           String = ShellCommandLineGetValue(Package, L"-w");

@@ -126,7 +126,7 @@ ShellCommandRunReset (
         }

       } else if (ShellCommandLineGetFlag(Package, L"-s")) {

         if (ShellCommandLineGetFlag(Package, L"-c")) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           String = ShellCommandLineGetValue(Package, L"-s");

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
index 288e7666a8..3986b36e7c 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
@@ -24,7 +24,7 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   Determine if a directory has no files in it.

 

   @param[in] FileHandle   The EFI_HANDLE to the directory.

-  

+

   @retval TRUE  The directory has no files (or directories).

   @retval FALSE The directory has at least 1 file or directory in it.

 **/

@@ -85,7 +85,7 @@ CascadeDelete(
   Status                = EFI_SUCCESS;

 

   if ((Node->Info->Attribute & EFI_FILE_READ_ONLY) == EFI_FILE_READ_ONLY) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_RM_LOG_DETELE_RO), gShellLevel2HiiHandle, L"rm", Node->FullName);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_RM_LOG_DETELE_RO), gShellLevel2HiiHandle, L"rm", Node->FullName);

     return (SHELL_ACCESS_DENIED);

   }

 

@@ -292,7 +292,7 @@ ShellCommandRunRm (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"rm", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"rm", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -309,7 +309,7 @@ ShellCommandRunRm (
       //

       // we insufficient parameters

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"rm");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"rm");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       //

@@ -322,7 +322,7 @@ ShellCommandRunRm (
          ){

         Status = ShellOpenFileMetaArg((CHAR16*)Param, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);

         if (EFI_ERROR(Status) || FileList == NULL || IsListEmpty(&FileList->Link)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"rm", (CHAR16*)Param);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"rm", (CHAR16*)Param);

           ShellStatus = SHELL_NOT_FOUND;

           break;

         }

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
index 7ca19427d5..dbec6460be 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
@@ -2,7 +2,7 @@
   Main file for attrib shell level 2 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -91,7 +91,7 @@ ShellCommandRunSet (
   Status = ShellCommandLineParse (SetParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"set", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"set", ProblemParam);

       FreePool(ProblemParam);

       return (SHELL_INVALID_PARAMETER);

     } else {

@@ -104,10 +104,10 @@ ShellCommandRunSet (
     if (ShellCommandLineGetFlag(Package, L"-?")) {

       ASSERT(FALSE);

     } else if (ShellCommandLineGetRawValue(Package, 3) != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"set");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"set");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (ShellCommandLineGetRawValue(Package, 1) != NULL && ShellCommandLineGetFlag(Package, L"-d")) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"set");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"set");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (ShellCommandLineGetFlag(Package, L"-d")) {

       //

@@ -115,12 +115,12 @@ ShellCommandRunSet (
       //

       KeyName = ShellCommandLineGetValue(Package, L"-d");

       if (KeyName == NULL) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"set", L"-d");  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"set", L"-d");

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         Status = ShellSetEnvironmentVariable(KeyName, L"", ShellCommandLineGetFlag(Package, L"-v"));

         if (EFI_ERROR(Status)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SET_ND), gShellLevel2HiiHandle, L"set", KeyName);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SET_ND), gShellLevel2HiiHandle, L"set", KeyName);

           ShellStatus = SHELL_DEVICE_ERROR;

         }

       }

@@ -144,7 +144,7 @@ ShellCommandRunSet (
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SET_ERROR_SET), gShellLevel2HiiHandle, L"set", KeyName);

           ShellStatus = (SHELL_STATUS) (Status & (~MAX_BIT));

         }

-        

+

       } else {

         if (KeyName != NULL) {

           //

@@ -152,7 +152,7 @@ ShellCommandRunSet (
           //

           Value = ShellGetEnvironmentVariable(KeyName);

           if (Value == NULL) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SET_NF), gShellLevel2HiiHandle, L"set", KeyName);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SET_NF), gShellLevel2HiiHandle, L"set", KeyName);

             ShellStatus = SHELL_SUCCESS;

           } else {

             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SET_DISP), gShellLevel2HiiHandle, KeyName, Value);

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
index 0b7551a239..0e948e3b0a 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
@@ -76,7 +76,7 @@ InternalIsTimeLikeString (
 }

 

 /**

-  Verify that the DateString is valid and if so set that as the current 

+  Verify that the DateString is valid and if so set that as the current

   date.

 

   @param[in] DateString     The pointer to a string representation of the date.

@@ -102,7 +102,7 @@ CheckAndSetDate (
 

   Status = gRT->GetTime(&TheTime, NULL);

   if (EFI_ERROR(Status)) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"date", L"gRT->GetTime", Status);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"date", L"gRT->GetTime", Status);

     return (SHELL_DEVICE_ERROR);

   }

 

@@ -195,7 +195,7 @@ ShellCommandRunDate (
   Status = ShellCommandLineParse (SfoParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"date", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"date", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -208,7 +208,7 @@ ShellCommandRunDate (
     if (ShellCommandLineGetFlag(Package, L"-?")) {

       ASSERT(FALSE);

     } else if (ShellCommandLineGetRawValue(Package, 2) != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"date");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"date");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       //

@@ -221,7 +221,7 @@ ShellCommandRunDate (
         //

         Status = gRT->GetTime(&TheTime, NULL);

         if (EFI_ERROR(Status)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"date", L"gRT->GetTime", Status);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"date", L"gRT->GetTime", Status);

           return (SHELL_DEVICE_ERROR);

         }

 

@@ -241,7 +241,7 @@ ShellCommandRunDate (
         }

       } else {

         if (PcdGet8(PcdShellSupportLevel) == 2) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"date");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"date");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           //

@@ -254,7 +254,7 @@ ShellCommandRunDate (
             ShellStatus = CheckAndSetDate(Param1);

           }

           if (ShellStatus != SHELL_SUCCESS) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"date", Param1);  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"date", Param1);

             ShellStatus = SHELL_INVALID_PARAMETER;

           }

         }

@@ -287,7 +287,7 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
   };

 

 /**

-  Verify that the TimeString is valid and if so set that as the current 

+  Verify that the TimeString is valid and if so set that as the current

   time.

 

   @param[in] TimeString     The pointer to a string representation of the time.

@@ -320,7 +320,7 @@ CheckAndSetTime (
 

   Status = gRT->GetTime(&TheTime, NULL);

   if (EFI_ERROR(Status)) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"time", L"gRT->GetTime", Status);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"time", L"gRT->GetTime", Status);

     return (SHELL_DEVICE_ERROR);

   }

 

@@ -433,7 +433,7 @@ ShellCommandRunTime (
   }

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"time", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"time", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -445,14 +445,14 @@ ShellCommandRunTime (
     //

     Status = gRT->GetTime(&TheTime, NULL);

     if (EFI_ERROR(Status)) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"time", L"gRT->GetTime", Status);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"time", L"gRT->GetTime", Status);

       return (SHELL_DEVICE_ERROR);

     }

 

     if (ShellCommandLineGetFlag(Package, L"-?")) {

       ASSERT(FALSE);

     } else if (ShellCommandLineGetRawValue(Package, 2) != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"time");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"time");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       //

@@ -539,11 +539,11 @@ ShellCommandRunTime (
               ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TIME_DST3), gShellLevel2HiiHandle);

               break;

             default:

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_ERROR), gShellLevel2HiiHandle, L"time", L"gRT->GetTime", L"TheTime.Daylight", TheTime.Daylight);  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_ERROR), gShellLevel2HiiHandle, L"time", L"gRT->GetTime", L"TheTime.Daylight", TheTime.Daylight);

           }

       } else {

         if (PcdGet8(PcdShellSupportLevel) == 2) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"time");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"time");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           //

@@ -578,7 +578,7 @@ ShellCommandRunTime (
               }

             }

             if (!(Tz >= -1440 && Tz <= 1440) && Tz != EFI_UNSPECIFIED_TIMEZONE) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"time", TempLocation, L"-tz");  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"time", TempLocation, L"-tz");

               ShellStatus = SHELL_INVALID_PARAMETER;

             }

           } else {

@@ -599,7 +599,7 @@ ShellCommandRunTime (
               Daylight = 0xff; //make it invalid = will not use

             }

             if (Daylight != 0 && Daylight != 1 && Daylight != 3) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"time", TempLocation, L"-d");  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"time", TempLocation, L"-d");

               ShellStatus = SHELL_INVALID_PARAMETER;

             }

           } else {

@@ -611,7 +611,7 @@ ShellCommandRunTime (
           if (ShellStatus == SHELL_SUCCESS) {

             ShellStatus = CheckAndSetTime(ShellCommandLineGetRawValue(Package, 1), Tz, Daylight);

             if (ShellStatus != SHELL_SUCCESS) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"time", ShellCommandLineGetRawValue(Package, 1));  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"time", ShellCommandLineGetRawValue(Package, 1));

               ShellStatus = SHELL_INVALID_PARAMETER;

             }

           }

@@ -688,7 +688,7 @@ STATIC CONST SHELL_PARAM_ITEM TimeZoneParamList3[] = {
 };

 

 /**

-  Verify that the TimeZoneString is valid and if so set that as the current 

+  Verify that the TimeZoneString is valid and if so set that as the current

   timezone.

 

   @param[in] TimeZoneString     The pointer to a string representation of the timezone.

@@ -733,7 +733,7 @@ CheckAndSetTimeZone (
 

   Status = gRT->GetTime(&TheTime, NULL);

   if (EFI_ERROR(Status)) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"timezone", L"gRT->GetTime", Status);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"timezone", L"gRT->GetTime", Status);

     return (SHELL_DEVICE_ERROR);

   }

 

@@ -829,7 +829,7 @@ ShellCommandRunTimeZone (
   }

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"timezone", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"timezone", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -840,18 +840,18 @@ ShellCommandRunTimeZone (
     // check for "-?"

     //

     if (ShellCommandLineGetCount(Package) > 1) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"timezone");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"timezone");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (ShellCommandLineGetFlag(Package, L"-?")) {

       ASSERT(FALSE);

     } else if (ShellCommandLineGetFlag(Package, L"-s")) {

       if ((ShellCommandLineGetFlag(Package, L"-l")) || (ShellCommandLineGetFlag(Package, L"-f"))) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"timezone", L"-l or -f");  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"timezone", L"-l or -f");

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         ASSERT(PcdGet8(PcdShellSupportLevel) == 3);

         if (ShellCommandLineGetValue(Package, L"-s") == NULL) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"timezone", L"-s");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"timezone", L"-s");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           //

@@ -859,7 +859,7 @@ ShellCommandRunTimeZone (
           //

           ShellStatus = CheckAndSetTimeZone(ShellCommandLineGetValue(Package, L"-s"));

           if (ShellStatus != SHELL_SUCCESS) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"timezone", ShellCommandLineGetValue(Package, L"-s"));  

+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"timezone", ShellCommandLineGetValue(Package, L"-s"));

             ShellStatus = SHELL_INVALID_PARAMETER;

           }

         }

@@ -880,7 +880,7 @@ ShellCommandRunTimeZone (
       //

       Status = gRT->GetTime(&TheTime, NULL);

       if (EFI_ERROR(Status)) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"timezone", L"gRT->GetTime", Status);  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"timezone", L"gRT->GetTime", Status);

         return (SHELL_DEVICE_ERROR);

       }

 

@@ -951,7 +951,7 @@ ShellCommandRunTimeZone (
               //

               ShellPrintHiiEx (-1, -1, NULL, TimeZoneList[LoopVar].StringId, gShellLevel2HiiHandle);

               break;

-            } 

+            }

           }

         } else {

           //

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index 36bc3552b5..cfad808193 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
@@ -269,7 +269,7 @@ VerifyIntermediateDirectories (
 

   @retval 0    Source and Target are identical strings without regard to case.

   @retval !=0  Source is not identical to Target.

-  

+

 **/

 INTN

 StrniCmp(

@@ -301,7 +301,7 @@ StrniCmp(
     FreePool (SourceCopy);

     return -1;

   }

-  

+

   SourceCopy[SourceLength] = L'\0';

   TargetCopy[TargetLength] = L'\0';

   Result = gUnicodeCollation->StriColl (gUnicodeCollation, SourceCopy, TargetCopy);

@@ -315,8 +315,8 @@ StrniCmp(
   Cleans off all the quotes in the string.

 

   @param[in]     OriginalString   pointer to the string to be cleaned.

-  @param[out]   CleanString      The new string with all quotes removed. 

-                                                  Memory allocated in the function and free 

+  @param[out]   CleanString      The new string with all quotes removed.

+                                                  Memory allocated in the function and free

                                                   by caller.

 

   @retval EFI_SUCCESS   The operation was successful.

@@ -328,7 +328,7 @@ ShellLevel2StripQuotes (
   )

 {

   CHAR16            *Walker;

-  

+

   if (OriginalString == NULL || CleanString == NULL) {

     return EFI_INVALID_PARAMETER;

   }

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index fef6adc3e1..fc61054cdc 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
@@ -9,7 +9,7 @@
   * functions are non-interactive only

 

 

-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -288,7 +288,7 @@ VerifyIntermediateDirectories (
 

   @retval 0    Source and Target are identical strings without regard to case.

   @retval !=0  Source is not identical to Target.

-  

+

 **/

 INTN

 StrniCmp(

@@ -301,8 +301,8 @@ StrniCmp(
   Cleans off all the quotes in the string.

 

   @param[in]     OriginalString   pointer to the string to be cleaned.

-  @param[out]   CleanString      The new string with all quotes removed. 

-                                                  Memory allocated in the function and free 

+  @param[out]   CleanString      The new string with all quotes removed.

+                                                  Memory allocated in the function and free

                                                   by caller.

 

   @retval EFI_SUCCESS   The operation was successful.

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni
index f9c647a035..7b16f3bfb8 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni
@@ -1,7 +1,7 @@
 // /**

 //

 // (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>

-// Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>

+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

 // This program and the accompanying materials

 // are licensed and made available under the terms and conditions of the BSD License

 // which accompanies this distribution. The full text of the license may be found at

@@ -271,7 +271,7 @@
 "     variable %cwd%.\r\n"

 ".SH EXAMPLES\r\n"

 " \r\n"

-"EXAMPLES:\r\n"     

+"EXAMPLES:\r\n"

 "  * To change the current file system to the mapped fs0 file system:\r\n"

 "    Shell> fs0:\r\n"

 " \r\n"

@@ -294,7 +294,7 @@
 "    fs1:\> cd Tmp\r\n"

 ".SH RETURNVALUES\r\n"

 " \r\n"

-"RETURN VALUES:\r\n"     

+"RETURN VALUES:\r\n"

 "  SHELL_SUCCESS             The action was completed as requested.\r\n"

 "  SHELL_SECURITY_VIOLATION  This function was not performed due to a security\r\n"

 "                            violation.\r\n"

@@ -723,7 +723,7 @@
 "     is specified by sname is deleted.\r\n"

 ".SH EXAMPLES\r\n"

 " \r\n"

-"EXAMPLES:\r\n"  

+"EXAMPLES:\r\n"

 "  * To add an environment variable:\r\n"

 "    Shell> set DiagnosticPath fs0:\efi\diag;fs1:\efi\diag\r\n"

 " \r\n"

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
index f911c7eae8..e6f4a1993f 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
@@ -2,7 +2,7 @@
   Main file for vol shell level 2 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -63,7 +63,7 @@ HandleVol(
       StrStr(Name, L"/") != NULL ||

       StrStr(Name, L" ") != NULL )

       ){

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"vol", Name);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"vol", Name);

     return (SHELL_INVALID_PARAMETER);

   }

 

@@ -73,7 +73,7 @@ HandleVol(
     Name != NULL?EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE:EFI_FILE_MODE_READ);

 

   if (EFI_ERROR(Status) || ShellFileHandle == NULL) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"vol", Path);  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"vol", Path);

     return (SHELL_ACCESS_DENIED);

   }

 

@@ -114,13 +114,13 @@ HandleVol(
     if (Size1 > Size2) {

       SysInfo = ReallocatePool((UINTN)SysInfo->Size, (UINTN)SysInfo->Size + Size1 - Size2, SysInfo);

       if (SysInfo == NULL) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellLevel2HiiHandle, L"vol");  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellLevel2HiiHandle, L"vol");

         ShellStatus = SHELL_OUT_OF_RESOURCES;

-      } 

+      }

     }

     if (SysInfo != NULL) {

-      StrCpyS ( (CHAR16 *) SysInfo->VolumeLabel, 

-                  (Size1>Size2? Size1/sizeof(CHAR16) : Size2/sizeof(CHAR16)), 

+      StrCpyS ( (CHAR16 *) SysInfo->VolumeLabel,

+                  (Size1>Size2? Size1/sizeof(CHAR16) : Size2/sizeof(CHAR16)),

                   Name

                   );

       SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + Size1;

@@ -130,13 +130,13 @@ HandleVol(
         (UINTN)SysInfo->Size,

         SysInfo);

     }

-  }  

+  }

 

   FreePool(SysInfo);

 

   if (Delete || Name != NULL) {

     if (EFI_ERROR(Status)) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"vol", Path);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"vol", Path);

       ShellStatus = SHELL_ACCESS_DENIED;

     }

   }

@@ -160,7 +160,7 @@ HandleVol(
   }

 

   gEfiShellProtocol->CloseFile(ShellFileHandle);

-  

+

   ASSERT(SysInfo != NULL);

 

   if (SysInfo != NULL) {

@@ -241,7 +241,7 @@ ShellCommandRunVol (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"vol", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"vol", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -256,7 +256,7 @@ ShellCommandRunVol (
     }

 

     if (ShellCommandLineGetCount(Package) > 2) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"vol");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"vol");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       PathName = ShellCommandLineGetRawValue(Package, 1);

@@ -264,7 +264,7 @@ ShellCommandRunVol (
         CurDir = gEfiShellProtocol->GetCurDir(NULL);

         if (CurDir == NULL) {

           ShellStatus = SHELL_NOT_FOUND;

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"vol");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"vol");

         } else {

           PathName = CurDir;

         }

@@ -283,13 +283,13 @@ ShellCommandRunVol (
         DeleteMode = ShellCommandLineGetFlag(Package, L"-d");

         NewName    = ShellCommandLineGetValue(Package, L"-n");

         if (DeleteMode && ShellCommandLineGetFlag(Package, L"-n")) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellLevel2HiiHandle, L"vol", L"-d", L"-n");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellLevel2HiiHandle, L"vol", L"-d", L"-n");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (ShellCommandLineGetFlag(Package, L"-n") && NewName == NULL) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"vol", L"-n");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"vol", L"-n");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (NewName != NULL && StrLen(NewName) > 11) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"vol", NewName, L"-n");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"vol", NewName, L"-n");

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (ShellStatus == SHELL_SUCCESS) {

           ShellStatus = HandleVol(