ShellPkg: Clean up source files

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / MkDir.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
index a0ba802bbd901b2070f29e5c2006a343a4b27248..21165c0ca7aef9fa3fd755193c26d0a9eecfb56e 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
@@ -1,8 +1,8 @@
 /** @file\r
   Main file for attrib shell level 2 function.\r
 \r
-  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -30,14 +30,19 @@ ShellCommandRunMkDir (
 {\r
   EFI_STATUS      Status;\r
   CONST CHAR16    *NewDirName;\r
+  CHAR16          *NewDirNameCopy;\r
+  CHAR16          *SplitName;\r
+  CHAR16          SaveSplitChar;\r
   UINTN           DirCreateCount;\r
   LIST_ENTRY      *Package;\r
   CHAR16          *ProblemParam;\r
   SHELL_FILE_HANDLE          FileHandle;\r
   SHELL_STATUS    ShellStatus;\r
 \r
-  ShellStatus  = SHELL_SUCCESS;\r
-\r
+  ShellStatus         = SHELL_SUCCESS;\r
+  NewDirNameCopy      = NULL;\r
+  SplitName           = NULL;\r
+  SaveSplitChar       = CHAR_NULL;\r
   //\r
   // initialize the shell lib (we must be in non-auto-init...)\r
   //\r
@@ -50,7 +55,7 @@ ShellCommandRunMkDir (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mkdir", ProblemParam);  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mkdir", ProblemParam);\r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -71,7 +76,7 @@ ShellCommandRunMkDir (
       //\r
       // we didnt get a single parameter\r
       //\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mkdir");  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mkdir");\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       for ( DirCreateCount = 1\r
@@ -99,21 +104,54 @@ ShellCommandRunMkDir (
           ShellCloseFile(&FileHandle);\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MKDIR_ALREADY), gShellLevel2HiiHandle, NewDirName);\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
-          break;\r
         } else {\r
           ASSERT(FileHandle == NULL);\r
           //\r
-          // create the directory named NewDirName\r
+          // create the nested directory from parent to child.\r
+          // if NewDirName = test1\test2\test3, first create "test1\" directory, then "test1\test2\", finally "test1\test2\test3".\r
           //\r
-          Status = ShellCreateDirectory(NewDirName, &FileHandle);\r
-          if (FileHandle != NULL) {\r
-            gEfiShellProtocol->CloseFile(FileHandle);\r
+          NewDirNameCopy = AllocateCopyPool (StrSize(NewDirName), NewDirName);\r
+          NewDirNameCopy = PathCleanUpDirectories (NewDirNameCopy);\r
+          if(NewDirNameCopy == NULL) {\r
+            ShellStatus = SHELL_OUT_OF_RESOURCES;\r
+            break;\r
+          }\r
+          SplitName = NewDirNameCopy;\r
+          while (SplitName != NULL) {\r
+            SplitName = StrStr (SplitName + 1, L"\\");\r
+            if (SplitName != NULL) {\r
+              SaveSplitChar = *(SplitName + 1);\r
+              *(SplitName + 1) = '\0';\r
+            }\r
+            //\r
+            // check if current nested directory already exists... continue to create the child directory.\r
+            //\r
+            Status = ShellOpenFileByName (NewDirNameCopy,\r
+                                    &FileHandle,\r
+                                    EFI_FILE_MODE_READ,\r
+                                    EFI_FILE_DIRECTORY\r
+                                    );\r
+            if (!EFI_ERROR(Status)) {\r
+              ShellCloseFile (&FileHandle);\r
+            } else {\r
+              Status = ShellCreateDirectory (NewDirNameCopy, &FileHandle);\r
+              if (EFI_ERROR(Status)) {\r
+                break;\r
+              }\r
+              if (FileHandle != NULL) {\r
+                gEfiShellProtocol->CloseFile (FileHandle);\r
+              }\r
+            }\r
+            if (SplitName != NULL) {\r
+              *(SplitName + 1) = SaveSplitChar;\r
+            }\r
           }\r
           if (EFI_ERROR(Status)) {\r
-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MKDIR_CREATEFAIL), gShellLevel2HiiHandle, NewDirName);\r
+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MKDIR_CREATEFAIL), gShellLevel2HiiHandle, NewDirName);\r
             ShellStatus = SHELL_ACCESS_DENIED;\r
             break;\r
           }\r
+          SHELL_FREE_NON_NULL (NewDirNameCopy);\r
         }\r
       }\r
     }\r