- +-------------+ +-------------+ +-------------+
+ +---------------+ +-------------+ +-------------+
Service Lists | ::ESL_SERVICE |-->| ESL_SERVICE |-->| ESL_SERVICE |--> NULL (pNext)
- +-------------+ +-------------+ +-------------+
+ +---------------+ +-------------+ +-------------+
^ | (pPortList) |
pUdp4List ^ | pTcp4List | |
| | | |
@@ -32,9 +32,9 @@
+---------------+ | |
| (pSocketList) | |
Socket List V V V
- +-------------+ +-------------+ +-------------+
+ +---------------+ +-------------+ +-------------+
| ::ESL_SOCKET |-->| ::ESL_PORT |-->| ESL_PORT |--> NULL (pLinkSocket)
- +-------------+ +-------------+ +-------------+
+ +---------------+ +-------------+ +-------------+
| | |
| | V
V V NULL
@@ -53,9 +53,9 @@
| `---------------. | |
pTxOobPacketListHead | | | |
V V V V
- +------------+ +------------+ +------------+ +------------+
+ +--------------+ +------------+ +------------+ +------------+
| ::ESL_PACKET | | ESL_PACKET | | ESL_PACKET | | ESL_PACKET |
- +------------+ +------------+ +------------+ +------------+
+ +--------------+ +------------+ +------------+ +------------+
| | | |
V V V V
+------------+ +------------+ +------------+ +------------+
diff U3b Temp/EfiCdefs.h-revBASE.svn001.tmp.h StdLib/Include/sys/EfiCdefs.h
--- Temp/EfiCdefs.h-revBASE.svn001.tmp.h Thu Mar 29 15:24:30 2012
+++ StdLib/Include/sys/EfiCdefs.h Wed Aug 20 14:31:16 2014
@@ -22,7 +22,7 @@
This file and its contents are inspired by the files in Berkeley
Unix. They have been re-implemented to be specific to the EFI environment.
- Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 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 that accompanies this distribution.
The full text of the license may be found at
@@ -360,8 +360,8 @@
#if defined(__GNUC__)
#if __GNUC_PREREQ__(4,4)
/* GCC 4.4 or later */
- typedef INT64 LONGN;
- typedef UINT64 ULONGN;
+ typedef INTN LONGN;
+ typedef UINTN ULONGN;
#else
/* minGW gcc variant */
typedef INT32 LONGN;
diff U3b Temp/errno.h-revBASE.svn002.tmp.h StdLib/Include/sys/errno.h
--- Temp/errno.h-revBASE.svn002.tmp.h Thu Aug 04 11:13:02 2011
+++ StdLib/Include/sys/errno.h Wed Aug 20 14:31:16 2014
@@ -7,7 +7,7 @@
directives. These default values are specified as an enum in order to ease
the maintenance of the values.
- Copyright (c) 2011, Intel Corporation. All rights reserved.
+ 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 that accompanies this distribution.
The full text of the license may be found at
@@ -22,6 +22,7 @@
/* Define the error numbers, sequentially, beginning at 1. */
enum {
+ __ESUCCESS = 0, /* 0 For those rare times one needs to say all is OK */
__EMINERRORVAL = 1, /* The lowest valid error value */
__EPERM = __EMINERRORVAL, /* 1 Operation not permitted */
__ENOENT, /* 2 No such file or directory */
diff U3b Temp/fcntl.h-revBASE.svn002.tmp.h StdLib/Include/sys/fcntl.h
--- Temp/fcntl.h-revBASE.svn002.tmp.h Tue Sep 25 15:01:58 2012
+++ StdLib/Include/sys/fcntl.h Wed Aug 20 14:31:16 2014
@@ -2,7 +2,7 @@
This file includes the definitions for open and fcntl described by POSIX
for ; it also includes related kernel definitions.
- Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 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
@@ -70,7 +70,7 @@
#define O_APPEND 0x00000008 ///< set append mode
#define O_CREAT 0x00000200 ///< create if nonexistent
#define O_TRUNC 0x00000400 ///< truncate to zero length
-#define O_EXCL 0x00000800 ///< error if already exists
+#define O_EXCL 0x00000800 ///< Grant EXCLusive access, or error if already exists and O_CREAT
#define O_DIRECTORY 0x00001000 ///< error if path is not a directory
#define O_NOCTTY 0x00002000 ///< Don't make this the controlling TTY
diff U3b Temp/stat.h-revBASE.svn001.tmp.h StdLib/Include/sys/stat.h
--- Temp/stat.h-revBASE.svn001.tmp.h Thu Sep 20 14:01:21 2012
+++ StdLib/Include/sys/stat.h Wed Aug 20 14:31:16 2014
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 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 that
accompanies this distribution. The full text of the license may be found at
@@ -120,20 +120,23 @@
#define S_EFISHIFT 20 // LS bit of the UEFI attributes
#define S_IFMT _S_IFMT
-#define S_IFBLK _S_IFBLK
-#define S_IFREG _S_IFREG
#define S_IFIFO _S_IFIFO
#define S_IFCHR _S_IFCHR
#define S_IFDIR _S_IFDIR
+#define S_IFBLK _S_IFBLK
+#define S_IFREG _S_IFREG
#define S_IFSOCK _S_IFSOCK
+#define S_ITTY _S_ITTY
+#define S_IWTTY _S_IWTTY
+#define S_ICONSOLE _S_ICONSOLE
-#define S_ISDIR(m) ((m & _S_IFMT) == _S_IFDIR) ///< directory
+#define S_ISFIFO(m) ((m & _S_IFMT) == _S_IFIFO) ///< fifo
#define S_ISCHR(m) ((m & _S_IFMT) == _S_IFCHR) ///< char special
-#define S_ISREG(m) ((m & _S_IFMT) == _S_IFREG) ///< regular file
+#define S_ISDIR(m) ((m & _S_IFMT) == _S_IFDIR) ///< directory
#define S_ISBLK(m) ((m & _S_IFMT) == _S_IFBLK) ///< block special
+#define S_ISREG(m) ((m & _S_IFMT) == _S_IFREG) ///< regular file
#define S_ISSOCK(m) ((m & _S_IFMT) == _S_IFSOCK) ///< socket
-#define S_ISFIFO(m) ((m & _S_IFMT) == _S_IFIFO) ///< fifo
/* The following three macros have been changed to reflect
access permissions that better reflect the UEFI FAT file system.
@@ -191,8 +194,18 @@
**/
int lstat (const char *, struct stat *);
- /**
- **/
+/** Obtains information about the file pointed to by path.
+
+ Opens the file pointed to by path, calls _EFI_FileInfo with the file's handle,
+ then closes the file.
+
+ @param[in] path Path to the file to obtain information about.
+ @param[out] statbuf Buffer in which the file status is put.
+
+ @retval 0 Successful Completion.
+ @retval -1 An error has occurred and errno has been set to
+ identify the error.
+**/
int stat (const char *, struct stat *);
/**
diff U3b Temp/errno.h-revBASE.svn003.tmp.h StdLib/Include/errno.h
--- Temp/errno.h-revBASE.svn003.tmp.h Wed Nov 02 17:52:37 2011
+++ StdLib/Include/errno.h Wed Aug 20 14:31:16 2014
@@ -26,7 +26,7 @@
All macro definitions in this list must begin with the letter 'E'
and be followed by a digit or an uppercase letter.
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 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 that accompanies this distribution.
The full text of the license may be found at
@@ -46,6 +46,7 @@
// Define error number in terms of the ENUM in
#define ERESTART -1 /* restart syscall */
+#define ESUCCESS __ESUCCESS /* No Problems */
#define EMINERRORVAL __EMINERRORVAL /* 1 The lowest valid error value */
diff U3b Temp/wchar.h-revBASE.svn001.tmp.h StdLib/Include/wchar.h
--- Temp/wchar.h-revBASE.svn001.tmp.h Tue Sep 25 15:01:58 2012
+++ StdLib/Include/wchar.h Wed Aug 20 14:31:15 2014
@@ -150,7 +150,7 @@
- WEOF might not be negative.
- mbstate_t objects are not intended to be inspected by programs.
- Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 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 that accompanies this distribution.
The full text of the license may be found at
@@ -1089,7 +1089,7 @@
characters, including the terminating null wide character of the input wide string. Then,
they attempt to convert the subject sequence to an integer, and return the result.
- @param[in] Nptr Pointer to the string to convert to a floating-point value.
+ @param[in] Nptr Pointer to the string to convert.
@param[in] EndPtr Optional pointer to an object in which to store a pointer
to the final wide string.
@param[in] Base Base, 0 to 36, of the value represented by the string
diff U3b Temp/float.h-revBASE.svn001.tmp.h StdLib/Include/x86/float.h
--- Temp/float.h-revBASE.svn001.tmp.h Thu Aug 04 16:35:57 2011
+++ StdLib/Include/x86/float.h Wed Aug 20 14:31:15 2014
@@ -1,5 +1,5 @@
/** @file
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 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 that accompanies this distribution.
The full text of the license may be found at
@@ -13,8 +13,9 @@
#ifndef _X86_FLOAT_H_
#define _X86_FLOAT_H_
-#if 0 /* Force all compilers to have the same limits */
-/* long double and double are the same in Microsoft compilers. */
+/* long double and double are the same in Microsoft compilers.
+ In GCC long double is fully supported.
+*/
#if !defined(_MSC_VER) /* Non-Microsoft compiler specifics. */
#define LDBL_MANT_DIG 64
#define LDBL_EPSILON 1.0842021724855044340E-19L
@@ -28,7 +29,6 @@
#define DECIMAL_DIG 21
#endif // !defined(_MSC_VER)
-#endif // if 0
#include
diff U3b Temp/Fifo.c-revBASE.svn001.tmp.c StdLib/LibC/Containers/Queues/Fifo.c
--- Temp/Fifo.c-revBASE.svn001.tmp.c Tue Sep 10 14:53:28 2013
+++ StdLib/LibC/Containers/Queues/Fifo.c Wed Aug 20 14:31:22 2014
@@ -15,7 +15,7 @@
One element of the FIFO is always reserved as the "terminator" element. Thus,
the capacity of a FIFO is actually NumElements-1.
- Copyright (c) 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2012 - 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
@@ -102,10 +102,10 @@
WDex = Self->WriteIndex;
if(RDex <= WDex) {
- Count = Self->NumElements - ((WDex - RDex) - 1);
+ Count = (Self->NumElements - (WDex - RDex)) - 1;
}
else {
- Count = (RDex - WDex);
+ Count = (RDex - WDex)-1;
}
if(As == AsBytes) {
Count *= Self->ElementSize;
@@ -221,32 +221,31 @@
assert(Self != NULL);
assert(pElement != NULL);
- if(FIFO_IsFull(Self)) {
- Count = 0;
+ if(FIFO_IsFull(Self)) { // FIFO is full so can't add to it
+ Count = 0; // Zero characters added
}
- else {
- Count = MIN(Count, Self->FreeSpace(Self, AsElements));
- SizeOfElement = Self->ElementSize;
- Windex = Self->WriteIndex;
-
- ElemPtr = (uintptr_t)pElement;
-
- QPtr = (uintptr_t)Self->Queue + (SizeOfElement * Windex);
- for(i = 0; i < Count; ++i) {
- (void)CopyMem((void *)QPtr, (const void *)ElemPtr, SizeOfElement);
- Windex = (UINT32)ModuloIncrement(Windex, Self->NumElements);
+ else { // Otherwise, FIFO is not full...
+ Count = MIN(Count, Self->FreeSpace(Self, AsElements)); // Smaller of requested or available space
+ SizeOfElement = Self->ElementSize; // Size of Elements, in bytes
+ Windex = Self->WriteIndex; // Index of first writable slot in FIFO
+
+ ElemPtr = (uintptr_t)pElement; // Addr. of element to add, as an integer
+ QPtr = (uintptr_t)Self->Queue + (SizeOfElement * Windex); // Addr. in FIFO to write, as an integer
+
+ for(i = 0; i < Count; ++i) { // For Count elements...
+ (void)CopyMem((void *)QPtr, (const void *)ElemPtr, SizeOfElement); // Copy an element into the FIFO
+ Windex = (UINT32)ModuloIncrement(Windex, Self->NumElements); // Increment the Write index, wrap if necessary
if(Windex == 0) { // If the index wrapped
- QPtr = (uintptr_t)Self->Queue;
+ QPtr = (uintptr_t)Self->Queue; // Go to the beginning
}
else {
- QPtr += SizeOfElement;
+ QPtr += SizeOfElement; // Otherwise, point to next in FIFO
}
- ElemPtr += SizeOfElement;
+ ElemPtr += SizeOfElement; // And also point to next Element to add
}
- (void)ZeroMem((void*)QPtr, SizeOfElement);
- Self->WriteIndex = Windex;
+ Self->WriteIndex = Windex; // Finally, save the new Write Index
}
- return Count;
+ return Count; // Number of elements added to FIFO
}
/** Read or copy elements from the FIFO.
@@ -277,7 +276,6 @@
BOOLEAN Consume
)
{
- UINTN ElemPtr;
UINTN QPtr;
UINT32 RDex;
UINT32 SizeOfElement;
@@ -285,38 +283,40 @@
assert(Self != NULL);
assert(pElement != NULL);
- assert(Count != 0);
if(FIFO_IsEmpty(Self)) {
Count = 0;
}
else {
- RDex = Self->ReadIndex;
- SizeOfElement = Self->ElementSize;
- ElemPtr = (UINTN)pElement;
- Count = MIN(Count, Self->Count(Self, AsElements));
-
- QPtr = (UINTN)Self->Queue + (RDex * Self->ElementSize);
- for(i = 0; i < Count; ++i) {
- (void)CopyMem((void *)ElemPtr, (const void *)QPtr, Self->ElementSize);
- RDex = (UINT32)ModuloIncrement(RDex, Self->NumElements);
+ RDex = Self->ReadIndex; // Get this FIFO's Read Index
+ SizeOfElement = Self->ElementSize; // Get size of this FIFO's elements
+ Count = MIN(Count, Self->Count(Self, AsElements)); // Lesser of requested or actual
+
+ QPtr = (UINTN)Self->Queue + (RDex * Self->ElementSize); // Point to Read location in FIFO
+ for(i = 0; i < Count; ++i) { // Iterate Count times...
+ (void)CopyMem(pElement, (const void *)QPtr, Self->ElementSize); // Copy element from FIFO to caller's buffer
+ RDex = (UINT32)ModuloIncrement(RDex, Self->NumElements); // Increment Read Index
if(RDex == 0) { // If the index wrapped
- QPtr = (UINTN)Self->Queue;
+ QPtr = (UINTN)Self->Queue; // Point back to beginning of data
}
- else {
- QPtr += Self->ElementSize;
- }
- ElemPtr += Self->ElementSize;
+ else { // Otherwise
+ QPtr += Self->ElementSize; // Point to the next element in FIFO
}
- if(Consume) {
- Self->ReadIndex = RDex;
+ pElement = (char*)pElement + Self->ElementSize; // Point to next element in caller's buffer
+ } // Iterate: for loop
+ if(Consume) { // If caller requests data consumption
+ Self->ReadIndex = RDex; // Set FIFO's Read Index to new Index
}
}
- return Count;
+ return Count; // Return number of elements actually read
}
/** Read elements from the FIFO.
+ Read the specified number of elements from the FIFO, removing each element read.
+ The number of elements actually read from the FIFO is returned. This number can differ
+ from the Count requested if more elements are requested than are in the FIFO.
+
@param[in] Self Pointer to the FIFO instance.
@param[out] pElement Pointer to where to store the element read from the FIFO.
@param[in] Count Number of elements to dequeue.
@@ -338,7 +338,7 @@
/** Make a copy of the FIFO's data.
The contents of the FIFO is copied out and linearized without affecting the
- FIFO contents.
+ FIFO contents. This function is idempotent.
@param[in] Self Pointer to the FIFO instance.
@param[out] pElement Pointer to where to store the elements copied from the FIFO.
@@ -435,7 +435,7 @@
assert(Self != NULL);
- NumInQ = FIFO_FreeSpace(Self, AsElements);
+ NumInQ = FIFO_NumInQueue(Self, AsElements);
if(NumToFlush >= NumInQ) {
Self->ReadIndex = 0;
Self->WriteIndex = 0;
@@ -464,7 +464,7 @@
assert(Self != NULL);
- Remainder = Self->Count(Self, AsElements);
+ Remainder = FIFO_NumInQueue(Self, AsElements);
if(Remainder > 0) {
Self->WriteIndex = (UINT32)ModuloDecrement(Self->WriteIndex, Self->NumElements);
--Remainder;
diff U3b Temp/realpath.c-revBASE.svn001.tmp.c StdLib/LibC/StdLib/realpath.c
--- Temp/realpath.c-revBASE.svn001.tmp.c Fri Jul 29 17:30:44 2011
+++ StdLib/LibC/StdLib/realpath.c Wed Sep 03 17:32:22 2014
@@ -1,7 +1,7 @@
/** @file
Implement the realpath function.
- Copyright (c) 2011, Intel Corporation
+ 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
@@ -9,21 +9,19 @@
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
+#include
#include
-/**
- The realpath() function shall derive, from the pathname pointed to by
+/** The realpath() function shall derive, from the pathname pointed to by
file_name, an absolute pathname that names the same file, whose resolution
- does not involve '.', '..', or symbolic links. The generated pathname shall
- be stored as a null-terminated string, up to a maximum of {PATH_MAX} bytes,
- in the buffer pointed to by resolved_name.
+ does not involve '.', '..', or symbolic links.
+
+ The generated pathname shall be stored as a null-terminated string, up to a
+ maximum of {PATH_MAX} bytes, in the buffer pointed to by resolved_name.
If resolved_name is a null pointer, the behavior of realpath() is
implementation-defined.
@@ -54,4 +52,4 @@
PathCleanUpDirectories(Temp);
UnicodeStrToAsciiStr(Temp, resolved_name);
return (resolved_name);
-}
\ No newline at end of file
+}