StdLib: Improve robustness of stat() and make basename() a public function.
AppPkg: Refinements to pyconfig.h and port of getpath.c to EDK II. Signed-off-by: darylm503 Reviewed-by: geekboy15a Reviewed-by: jljusten git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12508 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -291,7 +291,7 @@ __BEGIN_DECLS
|
||||
|
||||
@return
|
||||
**/
|
||||
int stat (const char *, void *);
|
||||
int stat (const char *, struct stat *);
|
||||
|
||||
/**
|
||||
@param[in]
|
||||
|
@@ -39,6 +39,7 @@ pid_t tcgetpgrp(int);
|
||||
char *getpass(const char *);
|
||||
int usleep(useconds_t);
|
||||
unsigned int sleep(unsigned int);
|
||||
char *basename(char *path);
|
||||
|
||||
// Networking
|
||||
long gethostid(void);
|
||||
|
@@ -304,14 +304,14 @@ da_ShellStat(
|
||||
}
|
||||
else {
|
||||
Status = RETURN_DEVICE_ERROR;
|
||||
errno = EIO;
|
||||
}
|
||||
errno = EFI2errno(Status);
|
||||
EFIerrno = Status;
|
||||
|
||||
if(FileInfo != NULL) {
|
||||
FreePool(FileInfo); // Release the buffer allocated by the GetInfo function
|
||||
}
|
||||
return errno? -1 : 0;
|
||||
return (Status == RETURN_SUCCESS)? 0 : -1;
|
||||
}
|
||||
|
||||
static
|
||||
|
@@ -923,7 +923,7 @@ fstat (int fd, struct stat *statbuf)
|
||||
identify the error.
|
||||
**/
|
||||
int
|
||||
stat (const char *path, void *statbuf)
|
||||
stat (const char *path, struct stat *statbuf)
|
||||
{
|
||||
int fd;
|
||||
int retval = -1;
|
||||
|
@@ -94,6 +94,7 @@
|
||||
#include <LibConfig.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/syslimits.h>
|
||||
|
||||
#ifndef HAVE_GETOPT
|
||||
char *optarg;
|
||||
@@ -138,11 +139,7 @@ getopt(int argc, char **argv, char *args)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#define ISPATHSEPARATOR(x) ((x == '/') || (x == '\\'))
|
||||
#else
|
||||
#define ISPATHSEPARATOR(x) (x == '/')
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_BASENAME
|
||||
#ifndef PATH_MAX
|
||||
|
@@ -4,6 +4,15 @@
|
||||
#
|
||||
# The including DSC file must DEFINE the EMULATE macro if
|
||||
# the application is to be run in an emulation environment.
|
||||
#
|
||||
# Copyright (c) 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
|
||||
# which accompanies this distribution. The full text of the license may be found at
|
||||
# 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.
|
||||
################################################################
|
||||
|
||||
##########
|
||||
@@ -53,10 +62,12 @@
|
||||
!ifndef $(EMULATE)
|
||||
# Not running in an Emulation Environment
|
||||
[LibraryClasses.IA32.UEFI_APPLICATION]
|
||||
TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
|
||||
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
|
||||
# TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
|
||||
|
||||
[LibraryClasses.X64.UEFI_APPLICATION]
|
||||
TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
|
||||
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
|
||||
# TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
|
||||
|
||||
[LibraryClasses.IPF.UEFI_APPLICATION]
|
||||
PalLib|MdePkg/Library/UefiPalLib/UefiPalLib.inf
|
||||
@@ -108,9 +119,9 @@
|
||||
!ifndef $(EMULATE)
|
||||
# These Build Options are used when building the Standard Libraries to be run
|
||||
# on real hardware.
|
||||
INTEL:*_*_*_CC_FLAGS = /Qfreestanding
|
||||
MSFT:*_*_*_CC_FLAGS = /X /Zc:wchar_t
|
||||
GCC:*_*_*_CC_FLAGS = -nostdinc -nostdlib
|
||||
INTEL:*_*_*_CC_FLAGS = /Qfreestanding
|
||||
MSFT:*_*_*_CC_FLAGS = /X /Zc:wchar_t /D NT32dvm
|
||||
GCC:*_*_*_CC_FLAGS = -nostdinc -nostdlib
|
||||
RVCT:*_*_*_CC_FLAGS = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm -DNT32dvm
|
||||
ARMGCC:*_*_*_CC_FLAGS = -nostdinc -nostdlib -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length -DNT32dvm
|
||||
|
||||
@@ -123,5 +134,3 @@
|
||||
MSFT:*_*_IA32_CC_FLAGS = /Od /D NT32dvm
|
||||
GCC:*_*_IA32_CC_FLAGS = -O0 -DNT32dvm
|
||||
!endif
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user