summaryrefslogtreecommitdiff
path: root/StdLib/LibC/Wchar
diff options
context:
space:
mode:
authordarylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-28 02:34:10 +0000
committerdarylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-28 02:34:10 +0000
commit53e1e5c647b73e45569ed6e8b8a0a5b276aa685e (patch)
treeffb715b3aa7f6299b7e370e2b8a3f50b3df903c5 /StdLib/LibC/Wchar
parentb00771f50a1f9d72852de544cff5cbfd951e71ac (diff)
downloadedk2-platforms-53e1e5c647b73e45569ed6e8b8a0a5b276aa685e.tar.xz
Add device abstraction code for the UEFI Console and UEFI Shell-based file systems.
Make argv use narrow characters instead of wide characters. Add setenv functionality. Add poll() system call. Change signal names into macros – required for standards compliance. The enums were renamed and moved to sys/signal.h and the new macros reference the enums. Added SIGBREAK, which is required for Python. Modify stdio functions to fail cleanly when called with a NULL File Pointer argument. Added <sys/cdefs.h> that just includes <sys/EfiCdefs.h>. By adding this wrapper, we improve compatibility with *nix files which assume <sys/cdefs> exists. Add <netdb.h> Added macros for bcopy(), bcmp() and strsep(). Modify the clock() function so that it does not hang when running under an emulation environment such as NT32. Move TM structure specific macros from the private tzfile.h into <time.h> Add strncasecmp function. Add strptime function. Add gettimeofday function. Add getcwd function. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11908 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'StdLib/LibC/Wchar')
-rw-r--r--StdLib/LibC/Wchar/ConsDecons.c27
-rw-r--r--StdLib/LibC/Wchar/Searching.c6
-rw-r--r--StdLib/LibC/Wchar/Wchar.inf2
3 files changed, 22 insertions, 13 deletions
diff --git a/StdLib/LibC/Wchar/ConsDecons.c b/StdLib/LibC/Wchar/ConsDecons.c
index ab139405fc..534d3e3b08 100644
--- a/StdLib/LibC/Wchar/ConsDecons.c
+++ b/StdLib/LibC/Wchar/ConsDecons.c
@@ -5,19 +5,17 @@
two wide characters the same way as two integers of the underlying integer
type designated by wchar_t.
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2011, 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 that accompanies this distribution.
The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
+ http://opensource.org/licenses/bsd-license.
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 <Uefi.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
+#include <Library/DebugLib.h>
#include <LibConfig.h>
@@ -36,11 +34,17 @@ __wchar_construct(
IN EFI_SYSTEM_TABLE *SystemTable
)
{
+ EFI_STATUS Status;
+
if( __wchar_bitmap == NULL) {
__wchar_bitmap_size = (WCHAR_MAX + 8) / 8U;
- __wchar_bitmap = AllocatePool(__wchar_bitmap_size);
- if( __wchar_bitmap == NULL) {
- EFIerrno = RETURN_OUT_OF_RESOURCES;
+
+ Status = SystemTable->BootServices->AllocatePool(
+ EfiBootServicesData, __wchar_bitmap_size, (VOID **)&__wchar_bitmap);
+ ASSERT(__wchar_bitmap != NULL);
+ if (EFI_ERROR (Status)) {
+ __wchar_bitmap = NULL;
+ EFIerrno = Status;
errno = ENOMEM;
return EFIerrno;
}
@@ -56,9 +60,12 @@ __wchar_deconstruct(
IN EFI_SYSTEM_TABLE *SystemTable
)
{
+ EFI_STATUS Status = RETURN_SUCCESS;
+
if( __wchar_bitmap != NULL) {
- FreePool( __wchar_bitmap);
+ Status = SystemTable->BootServices->FreePool( __wchar_bitmap);
+ ASSERT_EFI_ERROR (Status);
__wchar_bitmap = NULL;
}
- return RETURN_SUCCESS;
+ return Status;
}
diff --git a/StdLib/LibC/Wchar/Searching.c b/StdLib/LibC/Wchar/Searching.c
index c345dfe838..12556bd757 100644
--- a/StdLib/LibC/Wchar/Searching.c
+++ b/StdLib/LibC/Wchar/Searching.c
@@ -5,7 +5,7 @@
two wide characters the same way as two integers of the underlying integer
type designated by wchar_t.
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2011, 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 that accompanies this distribution.
The full text of the license may be found at
@@ -86,12 +86,14 @@ size_t wcscspn(const wchar_t *s1, const wchar_t *s2)
const wchar_t *str;
UINT8 bit;
int index;
+ size_t s1len;
if(*s1 == 0) return 0;
+ s1len = wcslen(s1);
BuildBitmap( __wchar_bitmap, s2, __wchar_bitmap_size);
- for(str = s1; ; str++) {
+ for(str = s1; str < &s1[s1len] ; str++) {
index = WHICH8(*str);
bit = WHICH_BIT(*str);
if ((__wchar_bitmap[index] & bit) != 0)
diff --git a/StdLib/LibC/Wchar/Wchar.inf b/StdLib/LibC/Wchar/Wchar.inf
index 427d615742..5a88233600 100644
--- a/StdLib/LibC/Wchar/Wchar.inf
+++ b/StdLib/LibC/Wchar/Wchar.inf
@@ -52,7 +52,7 @@
# DO NOT use them when building your application!
# Nasty things could happen if you do.
#
-# /Oi is required for Microsoft VC++ to allow "intrinsic" functions to be
+# /Oi- is required for Microsoft VC++ to allow "intrinsic" functions to be
# defined in this library.
#
[BuildOptions]