BaseTools: Change source files to DOS format.

[mirror_edk2.git] / BaseTools / Source / C / EfiLdrImage / EfiLdrImage.c

diff --git a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
index c2c8111d31be31c35c5e3cdbe012b4e956c312a0..88cc345cdc1ee25750fcd58613b80616013161a4 100644 (file)
--- a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
+++ b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
@@ -1,7 +1,13 @@
 /** @file\r
-\r
-Copyright 2006 - 2008, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Creates and EFILDR image.\r
+This tool combines several PE Image files together using following format denoted as EBNF:\r
+FILE := EFILDR_HEADER\r
+        EFILDR_IMAGE +\r
+        <PeImageFileContent> +\r
+The order of EFILDR_IMAGE is same as the order of placing PeImageFileContent.\r
+  \r
+Copyright (c) 2006 - 2016, 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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -9,21 +15,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-Module Name:\r
-\r
-  efildrimage.c\r
-\r
-Abstract:\r
-\r
-  Creates and EFILDR image.\r
-  This tool combines several PE Image files together using following format denoted as EBNF:\r
-  FILE := EFILDR_HEADER\r
-          EFILDR_IMAGE +\r
-          <PeImageFileContent> +\r
-  The order of EFILDR_IMAGE is same as the order of placing PeImageFileContent.\r
-\r
-Revision History\r
-\r
 **/\r
 \r
 \r
@@ -60,8 +51,8 @@ typedef struct {
 //\r
 // Utility version information\r
 //\r
-#define UTILITY_MAJOR_VERSION 0\r
-#define UTILITY_MINOR_VERSION 1\r
+#define UTILITY_MAJOR_VERSION 1\r
+#define UTILITY_MINOR_VERSION 0\r
 \r
 void\r
 Version (\r
@@ -83,8 +74,8 @@ Returns:
 \r
 --*/\r
 {\r
-  printf ("%s v%d.%d -Utility to break a file into two pieces at the request offset.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
-  printf ("Copyright (c) 1999-2007 Intel Corporation. All rights reserved.\n");\r
+  printf ("%s Version %d.%d Build %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
+  exit (0);\r
 }\r
 \r
 VOID\r
@@ -93,7 +84,9 @@ Usage (
   )\r
 {\r
   printf ("Usage: EfiLdrImage -o OutImage LoaderImage PeImage1 PeImage2 ... PeImageN\n");\r
-  exit (1);\r
+  printf ("%s Version %d.%d Build %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
+  printf ("Copyright (c) 1999-2016 Intel Corporation. All rights reserved.\n");\r
+  printf ("\n  The EfiLdrImage tool is used to combine PE files into EFILDR image with Efi loader header.\n");\r
 }\r
 \r
 EFI_STATUS\r
@@ -181,7 +174,6 @@ Returns:
   CHAR8* OutputFileName = NULL;\r
   CHAR8* InputFileNames[MAX_PE_IMAGES + 1];\r
   UINT8 InputFileCount = 0;\r
-  BOOLEAN QuietFlag = FALSE;\r
   UINT64        DebugLevel = 0;\r
   UINT64        VerboseLevel = 0;\r
   EFI_STATUS Status = EFI_SUCCESS;\r
@@ -189,7 +181,7 @@ Returns:
   SetUtilityName (UTILITY_NAME);\r
 \r
   if (argc == 1) {\r
-    Usage();\r
+    printf ("Usage: EfiLdrImage -o OutImage LoaderImage PeImage1 PeImage2 ... PeImageN\n");\r
     return STATUS_ERROR;\r
   }\r
   \r
@@ -220,7 +212,6 @@ Returns:
     }\r
     \r
     if ((stricmp (argv[0], "-q") == 0) || (stricmp (argv[0], "--quiet") == 0)) {\r
-      QuietFlag = TRUE;\r
       argc --;\r
       argv ++;\r
       continue; \r
@@ -272,7 +263,7 @@ Returns:
     return STATUS_ERROR;\r
   }\r
 \r
-  fpOut = fopen(OutputFileName, "w+b");\r
+  fpOut = fopen (LongFilePath (OutputFileName), "w+b");\r
   if (!fpOut) {\r
     Error (NULL, 0, 0001, "Could not open output file", OutputFileName);\r
     return STATUS_ERROR;\r
@@ -296,7 +287,7 @@ Returns:
     //\r
     // Copy the content of PeImage file to output file\r
     //\r
-    fpIn = fopen (InputFileNames[i], "rb");\r
+    fpIn = fopen (LongFilePath (InputFileNames[i]), "rb");\r
     if (!fpIn) {\r
       Error (NULL, 0, 0001, "Could not open input file", InputFileNames[i]);\r
       fclose (fpOut);\r