From 0c1992fbccd139e9d3bb730c19a79847c6a5a246 Mon Sep 17 00:00:00 2001 From: darylm503 Date: Wed, 30 Nov 2011 00:52:45 +0000 Subject: StdLib: Add isDirSep character classification macro and function. Implement several Posix functions and clean up EfiSysCall.h. Align file mode handling with UEFI file protocol flags. Include/ctype.h: Function declaration and Macro definition of isDirSep Include/unistd.h: Declarations added from EfiSysCall.h Include/utime.h: New file. For the Posix utime() function. Include/sys/_ctype.h: Update character class bit maps. Include/sys/EfiSysCall.h: Move declarations to unistd.h Include/sys/fcntl.h: Improve comments. Add UEFI-specific macros. Include/sys/filio.h: Remove declarations for unsupported file ioctls. Include/sys/stat.h: Fix flags. Add macros and declarations. Include/sys/time.h: Add declarations for new functions Tm2Efi() and Time2Efi(). Include/sys/types.h: Use EFI-specific instead of BSD-specific definitions for typedefs. Include/sys/unistd.h: Delete inappropriate content. Guard macro definitions. LibC/Locale/setlocale.c LibC/Stdio/{fdopen.c, findfp.c, fopen.c, freopen.c, gettemp.c, makebuf.c, mktemp.c, remove.c, stdio.c, tempnam.c, tmpfile.c, tmpnam.c} LibC/Time/{itimer.c, ZoneProc.c} LibC/Uefi/SysCalls.c LibC/Uefi/Devices/Console/daConsole.c LibC/Uefi/Devices/UefiShell/daShell.c PosixLib/Gen/readdir.c Include unistd.h instead of EfiSysCall.h LibC/Ctype/CClass.c: Character classification function implementation for isDirSep. LibC/Ctype/iCtype.c: Update character classification and case conversion tables. LibC/Time/TimeEfi.c: Improve comments. Implement new functions Tm2Efi() and Time2Efi(). LibC/Uefi/StubFunctions.c: Add missing include. Cosmetic changes to declarations. LibC/Uefi/SysCalls.c: Add support function for utime(). LibC/Uefi/Uefi.inf: Add LibGen library class dependency. LibC/Uefi/Xform.c: Enhance Omode2EFI(). LibC/Uefi/Devices/UefiShell/daShell.c: Enhance da_ShellMkdir. Implement da_ShellIoctl to set file times. PosixLib/Gen/access.c: New file. Implement the access() function. PosixLib/Gen/dirname.c: Enhance to use isDirSep and differentiate between the device, path, and filename components of UEFI Shell-style paths. PosixLib/Gen/utime.c: New file. Implement the utime() function. PosixLib/Gen/LibGen.inf: Change MODULE_TYPE. Add new files. Signed-off-by: darylm503 Reviewed-by: geekboy15a Reviewed-by: jljusten Reviewed-by: Rahul Khana Reviewed-by: leegrosenbaum git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12800 6f19259b-4bc3-4df7-8a09-765794883524 --- StdLib/LibC/Uefi/Devices/Console/daConsole.c | 2 +- StdLib/LibC/Uefi/Devices/UefiShell/daShell.c | 188 +++++++++++++++++++++++++-- 2 files changed, 180 insertions(+), 10 deletions(-) (limited to 'StdLib/LibC/Uefi/Devices') diff --git a/StdLib/LibC/Uefi/Devices/Console/daConsole.c b/StdLib/LibC/Uefi/Devices/Console/daConsole.c index 600fb073c4..e9983e9933 100644 --- a/StdLib/LibC/Uefi/Devices/Console/daConsole.c +++ b/StdLib/LibC/Uefi/Devices/Console/daConsole.c @@ -21,13 +21,13 @@ #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c b/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c index de14ef31c5..861765e6bc 100644 --- a/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c +++ b/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -30,12 +29,21 @@ #include #include #include +#include #include +#include #include #include #include #include +/** EFI Shell specific operations for close(). + + @param[in] Fp Pointer to a file descriptor structure. + + @retval 0 Successful completion. + @retval -1 Operation failed. Further information is specified by errno. +**/ static int EFIAPI @@ -50,6 +58,13 @@ da_ShellClose( return 0; } +/** EFI Shell specific operations for deleting a file or directory. + + @param[in] filp Pointer to a file descriptor structure. + + @retval 0 Successful completion. + @retval -1 Operation failed. Further information is specified by errno. +**/ static int EFIAPI @@ -68,6 +83,14 @@ da_ShellDelete( return 0; } +/** EFI Shell specific operations for setting the position within a file. + + @param[in] filp Pointer to a file descriptor structure. + @param[in] offset Relative position to move to. + @param[in] whence Specifies the location offset is relative to: Beginning, Current, End. + + @return Returns the new file position or EOF if the seek failed. +**/ static off_t EFIAPI @@ -126,6 +149,9 @@ da_ShellSeek( The directory is closed after it is created. + @param[in] path The directory to be created. + @param[in] perms Access permissions for the new directory. + @retval 0 The directory was created successfully. @retval -1 An error occurred and an error code is stored in errno. **/ @@ -137,6 +163,7 @@ da_ShellMkdir( __mode_t perms ) { + UINT64 TempAttr; SHELL_FILE_HANDLE FileHandle; RETURN_STATUS Status; EFI_FILE_INFO *FileInfo; @@ -152,7 +179,8 @@ da_ShellMkdir( FileInfo = ShellGetFileInfo( FileHandle); Status = RETURN_ABORTED; // In case ShellGetFileInfo() failed if(FileInfo != NULL) { - FileInfo->Attribute = Omode2EFI(perms); + TempAttr = FileInfo->Attribute & (EFI_FILE_RESERVED | EFI_FILE_DIRECTORY); + FileInfo->Attribute = TempAttr | Omode2EFI(perms); Status = ShellSetFileInfo( FileHandle, FileInfo); FreePool(FileInfo); if(Status == RETURN_SUCCESS) { @@ -168,6 +196,16 @@ da_ShellMkdir( return retval; } +/** EFI Shell specific operations for reading from a file. + + @param[in] filp Pointer to a file descriptor structure. + @param[in] offset Offset into the file to begin reading at, or NULL. + @param[in] BufferSize Number of bytes in Buffer. Max number of bytes to read. + @param[in] Buffer Pointer to a buffer to receive the read data. + + @return Returns the number of bytes successfully read, + or -1 if the operation failed. Further information is specified by errno. +**/ static ssize_t EFIAPI @@ -209,6 +247,16 @@ da_ShellRead( return BufSize; } +/** EFI Shell specific operations for writing to a file. + + @param[in] filp Pointer to a file descriptor structure. + @param[in] offset Offset into the file to begin writing at, or NULL. + @param[in] BufferSize Number of bytes in Buffer. Max number of bytes to write. + @param[in] Buffer Pointer to a buffer containing the data to be written. + + @return Returns the number of bytes successfully written, + or -1 if the operation failed. Further information is specified by errno. +**/ static ssize_t EFIAPI @@ -261,6 +309,15 @@ da_ShellWrite( return BufSize; } +/** EFI Shell specific operations for getting information about an open file. + + @param[in] filp Pointer to a file descriptor structure. + @param[out] statbuf Buffer in which to store the file status. + @param[in] Something This parameter is not used by this device. + + @retval 0 Successful completion. + @retval -1 Operation failed. Further information is specified by errno. +**/ static int EFIAPI @@ -314,6 +371,15 @@ da_ShellStat( return (Status == RETURN_SUCCESS)? 0 : -1; } +/** EFI Shell specific operations for low-level control of a file or device. + + @param[in] filp Pointer to a file descriptor structure. + @param[in] cmd The command this ioctl is to perform. + @param[in,out] argp Zero or more arguments as needed by the command. + + @retval 0 Successful completion. + @retval -1 Operation failed. Further information is specified by errno. +**/ static int EFIAPI @@ -323,10 +389,70 @@ da_ShellIoctl( va_list argp ) { - return -EPERM; + EFI_FILE_INFO *FileInfo = NULL; + SHELL_FILE_HANDLE FileHandle; + RETURN_STATUS Status = RETURN_SUCCESS; + int retval = 0; + + FileHandle = (SHELL_FILE_HANDLE)filp->devdata; + + FileInfo = ShellGetFileInfo( FileHandle); + + if(FileInfo != NULL) { + if( cmd == (ULONGN)FIOSETIME) { + struct timeval *TV; + EFI_TIME *ET; + int mod = 0; + + TV = va_arg(argp, struct timeval*); + if(TV[0].tv_sec != 0) { + ET = Time2Efi(TV[0].tv_sec); + if(ET != NULL) { + (void) memcpy(&FileInfo->LastAccessTime, ET, sizeof(EFI_TIME)); + FileInfo->LastAccessTime.Nanosecond = TV[0].tv_usec * 1000; + free(ET); + ++mod; + } + } + if(TV[1].tv_sec != 0) { + ET = Time2Efi(TV[1].tv_sec); + if(ET != NULL) { + (void) memcpy(&FileInfo->ModificationTime, ET, sizeof(EFI_TIME)); + FileInfo->ModificationTime.Nanosecond = TV[1].tv_usec * 1000; + free(ET); + ++mod; + } + } + /* Set access and modification times */ + Status = ShellSetFileInfo(FileHandle, FileInfo); + errno = EFI2errno(Status); + } + } + else { + Status = RETURN_DEVICE_ERROR; + errno = EIO; + } + if(RETURN_ERROR(Status)) { + retval = -1; + } + EFIerrno = Status; + + if(FileInfo != NULL) { + FreePool(FileInfo); // Release the buffer allocated by the GetInfo function + } + return retval; } -/** Open an abstract Shell File. +/** EFI Shell specific operations for opening a file or directory. + + @param[in] DevNode Pointer to a device descriptor + @param[in] filp Pointer to a file descriptor structure. + @param[in] DevInstance Not used by this device. + @param[in] Path File-system path to the file or directory. + @param[in] MPath Device or Map name on which Path resides. + + @return Returns a file descriptor for the newly opened file, + or -1 if the Operation failed. Further information is specified by errno. **/ int EFIAPI @@ -447,14 +573,19 @@ da_ShellOpen( } #include -/* Returns a bit mask describing which operations could be completed immediately. +/** Returns a bit mask describing which operations could be completed immediately. For now, assume the file system, via the shell, is always ready. (POLLIN | POLLRDNORM) The file system is ready to be read. (POLLOUT) The file system is ready for output. -*/ + @param[in] filp Pointer to a file descriptor structure. + @param[in] events Bit mask describing which operations to check. + + @return The returned value is a bit mask describing which operations + could be completed immediately, without blocking. +**/ static short EFIAPI @@ -488,6 +619,14 @@ da_ShellPoll( return (retval & (events | POLL_RETONLY)); } +/** EFI Shell specific operations for renaming a file. + + @param[in] from Name of the file to be renamed. + @param[in] to New name for the file. + + @retval 0 Successful completion. + @retval -1 Operation failed. Further information is specified by errno. +**/ static int EFIAPI @@ -553,6 +692,13 @@ da_ShellRename( return -1; } +/** EFI Shell specific operations for deleting directories. + + @param[in] filp Pointer to a file descriptor structure. + + @retval 0 Successful completion. + @retval -1 Operation failed. Further information is specified by errno. +**/ static int EFIAPI @@ -562,10 +708,12 @@ da_ShellRmdir( { SHELL_FILE_HANDLE FileHandle; RETURN_STATUS Status = RETURN_SUCCESS; - EFI_FILE_INFO *FileInfo = NULL; + EFI_FILE_INFO *FileInfo; + int OldErrno; int Count = 0; BOOLEAN NoFile = FALSE; + OldErrno = errno; // Save the original value errno = 0; // Make it easier to see if we have an error later FileHandle = (SHELL_FILE_HANDLE)filp->devdata; @@ -576,8 +724,8 @@ da_ShellRmdir( errno = ENOTDIR; } else { - // See if the directory has any entries other than ".." and ".". FreePool(FileInfo); // Free up the buffer from ShellGetFileInfo() + // See if the directory has any entries other than ".." and ".". Status = ShellFindFirstFile( FileHandle, &FileInfo); if(Status == RETURN_SUCCESS) { ++Count; @@ -593,15 +741,22 @@ da_ShellRmdir( Count = 99; } } - FreePool(FileInfo); // Free buffer from ShellFindFirstFile() + /* Count == 99 and FileInfo is allocated if ShellFindNextFile failed. + ShellFindNextFile has freed FileInfo itself if it sets NoFile TRUE. + */ + if((! NoFile) || (Count == 99)) { + free(FileInfo); // Free buffer from ShellFindFirstFile() + } if(Count < 3) { // Directory is empty Status = ShellDeleteFile( &FileHandle); if(Status == RETURN_SUCCESS) { EFIerrno = RETURN_SUCCESS; + errno = OldErrno; // Restore the original value return 0; /* ######## SUCCESSFUL RETURN ######## */ } + /* FileInfo is freed and FileHandle closed. */ } else { if(Count == 99) { @@ -617,6 +772,7 @@ da_ShellRmdir( else { errno = EIO; } + ShellCloseFile( &FileHandle); EFIerrno = Status; if(errno == 0) { errno = EFI2errno( Status ); @@ -628,6 +784,13 @@ da_ShellRmdir( Allocate the instance structure and populate it with the information for the device. + + @param[in] ImageHandle This application's image handle. + @param[in] SystemTable Pointer to the UEFI System Table. + + @retval RETURN_SUCCESS Successful completion. + @retval RETURN_OUT_OF_RESOURCES Failed to allocate memory for new device. + @retval RETURN_INVALID_PARAMETER A default device has already been created. **/ RETURN_STATUS EFIAPI @@ -669,6 +832,13 @@ __ctor_DevShell( return Status; } +/** Destructor for previously constructed EFI Shell device instances. + + @param[in] ImageHandle This application's image handle. + @param[in] SystemTable Pointer to the UEFI System Table. + + @retval 0 Successful completion is always returned. +**/ RETURN_STATUS EFIAPI __dtor_DevShell( -- cgit v1.2.3