diff options
| author | Daryl McDaniel <daryl.mcdaniel@intel.com> | 2014-07-17 01:55:23 +0000 |
|---|---|---|
| committer | darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-07-17 01:55:23 +0000 |
| commit | caf89d64ff700b3d8807f477c172feaaae85d5f3 (patch) | |
| tree | 7d4e280e894a09fe0c1d7ba703c156e30bd22502 /StdLib/LibC | |
| parent | 1b98d6ce44baea807223c67ddf97cc0dc9108741 (diff) | |
| download | edk2-platforms-caf89d64ff700b3d8807f477c172feaaae85d5f3.tar.xz | |
StdLib: Move GetPass.c out of Uefi and into PosixLib. Create LibPosix to contain all functions from PosixLib instead of individual libraries. Retains the ability to use the individual libraries, except GetPass, for backwards compatibility.
StdLib/LibC/Uefi/GetPass.c
COPY to StdLib/PosixLib/GetPass/GetPass.c
DELETE
StdLib/PosixLib/GetPass/GetPass.c
NEW, COPIED from StdLib/LibC/Uefi/GetPass.c
StdLib/PosixLib/PosixLib.inf
Create a LibPosix library class to build all PosixLib functions into a single library.
Move GetPass from LibC/Uefi to PosixLib.inf
StdLib/LibC/Uefi/Uefi.inf
Remove GetPass.c from sources.
Remove IPF from VALID_ARCHITECTURES
Update VERSION_STRING
Align [Defines] on a two-character boundary
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Daryl McDaniel <daryl.mcdaniel@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15663 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'StdLib/LibC')
| -rw-r--r-- | StdLib/LibC/Uefi/GetPass.c | 57 | ||||
| -rw-r--r-- | StdLib/LibC/Uefi/Uefi.inf | 19 |
2 files changed, 8 insertions, 68 deletions
diff --git a/StdLib/LibC/Uefi/GetPass.c b/StdLib/LibC/Uefi/GetPass.c deleted file mode 100644 index 9c0c1f4116..0000000000 --- a/StdLib/LibC/Uefi/GetPass.c +++ /dev/null @@ -1,57 +0,0 @@ -/** @file Implement the getpass function.
-
- Copyright (c) 2011, Intel Corporation <BR>
- All rights reserved. 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
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <Library/ShellLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiLib.h>
-#include <Library/PcdLib.h>
-
-static CHAR8 *ReturnStringAscii = NULL;
-
-char *getpass(const char *Prompt)
-{
- BOOLEAN Ascii;
- CHAR16 *ReturnString;
-
- Ascii = FALSE;
-
- Print(L"%a", Prompt);
-
- ReturnString = ShellFileHandleReturnLine (gEfiShellParametersProtocol->StdIn, &Ascii);
- if (ReturnString == NULL) {
- return (NULL);
- }
-
- ReturnStringAscii = AllocateZeroPool((StrLen(ReturnString)+1)*sizeof(CHAR8));
- if (ReturnStringAscii == NULL) {
- return (NULL);
- }
-
- UnicodeStrToAsciiStr(ReturnString, ReturnStringAscii);
-
- FreePool(ReturnString);
-
- return (ReturnStringAscii);
-}
-
-EFI_STATUS
-EFIAPI
-DestructMePlease (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
- )
-{
- SHELL_FREE_NON_NULL(ReturnStringAscii);
-
- return EFI_SUCCESS;
-}
\ No newline at end of file diff --git a/StdLib/LibC/Uefi/Uefi.inf b/StdLib/LibC/Uefi/Uefi.inf index 71bcb37f02..1982dd9761 100644 --- a/StdLib/LibC/Uefi/Uefi.inf +++ b/StdLib/LibC/Uefi/Uefi.inf @@ -1,7 +1,7 @@ ## @file
# Standard C library: UEFI "system calls".
#
-# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2014, 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
@@ -9,21 +9,19 @@ # http://opensource.org/licenses/bsd-license.php.
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
##
[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = LibUefi
- FILE_GUID = 1dcff17c-aa53-4b78-b234-864027555035
- MODULE_TYPE = UEFI_APPLICATION
- VERSION_STRING = 1.0
- LIBRARY_CLASS = LibUefi
+ INF_VERSION = 0x00010005
+ BASE_NAME = LibUefi
+ FILE_GUID = 1dcff17c-aa53-4b78-b234-864027555035
+ MODULE_TYPE = UEFI_APPLICATION
+ VERSION_STRING = 1.05
+ LIBRARY_CLASS = LibUefi
LIBRARY_DESTRUCTOR = DestructMePlease
#
-# VALID_ARCHITECTURES = IA32 X64 IPF
+# VALID_ARCHITECTURES = IA32 X64
#
[Sources]
@@ -32,7 +30,6 @@ writev.c
Xform.c
compat.c
- GetPass.c
StubFunctions.c
[Packages]
|