From caf89d64ff700b3d8807f477c172feaaae85d5f3 Mon Sep 17 00:00:00 2001 From: Daryl McDaniel Date: Thu, 17 Jul 2014 01:55:23 +0000 Subject: 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 Reviewed-by: Erik Bjorge git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15663 6f19259b-4bc3-4df7-8a09-765794883524 --- StdLib/PosixLib/GetPass/GetPass.c | 57 +++++++++++++++++++++++++++++++++++++ StdLib/PosixLib/PosixLib.inf | 59 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 StdLib/PosixLib/GetPass/GetPass.c create mode 100644 StdLib/PosixLib/PosixLib.inf (limited to 'StdLib/PosixLib') diff --git a/StdLib/PosixLib/GetPass/GetPass.c b/StdLib/PosixLib/GetPass/GetPass.c new file mode 100644 index 0000000000..46511e39a2 --- /dev/null +++ b/StdLib/PosixLib/GetPass/GetPass.c @@ -0,0 +1,57 @@ +/** @file + Implement the getpass function. + + Copyright (c) 2011 - 2014, Intel Corporation
+ 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 +#include +#include +#include + +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; +} diff --git a/StdLib/PosixLib/PosixLib.inf b/StdLib/PosixLib/PosixLib.inf new file mode 100644 index 0000000000..44b8054c25 --- /dev/null +++ b/StdLib/PosixLib/PosixLib.inf @@ -0,0 +1,59 @@ +## @file +# Library used for supplying some POSIX routines. +# +# Copyright (c) 2011 - 2014, Intel Corporation. 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. +# +# +## + +[Defines] + INF_VERSION = 0x00010006 + BASE_NAME = LibPosix + FILE_GUID = C516673C-6C71-4F0E-83B5-57FC662376EC + MODULE_TYPE = UEFI_APPLICATION + VERSION_STRING = 1.05 + LIBRARY_CLASS = LibPosix|UEFI_APPLICATION UEFI_DRIVER + + +# +# VALID_ARCHITECTURES = IA32 X64 EBC +# + +[Sources.common] + Err/warn_err.c + + Gen/dirname.c + Gen/opendir.c + Gen/closedir.c + Gen/readdir.c + Gen/access.c + Gen/utime.c + + Glob/glob.c + + Stringlist/stringlist.c + + GetPass/GetPass.c + + +[Packages] + MdePkg/MdePkg.dec + StdLib/StdLib.dec + StdLibPrivateInternalFiles/DoNotUse.dec + ShellPkg/ShellPkg.dec + +[LibraryClasses] + MemoryAllocationLib + ShellLib + BaseLib + LibC + LibStdio + LibStdLib + LibString -- cgit v1.2.3