2 files changed, 22 insertions, 9 deletions
diff --git a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
index 447ab5631a..aae9582a6a 100644
--- a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
+++ b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
@@ -2,7 +2,7 @@
   Support a Semi Host file system over a debuggers JTAG
 
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-  Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
+  Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -544,7 +544,9 @@ FileSetInfo (
   if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) != 0) {
     //Status = SetFilesystemInfo (Fcb, BufferSize, Buffer);
   } else if (CompareGuid (InformationType, &gEfiFileInfoGuid) != 0) {
-    //Status = SetFileInfo (Fcb, BufferSize, Buffer);
+    // Semihosting does not give us access to setting file info, but
+    // if we fail here we cannot create new files.
+    Status = EFI_SUCCESS;
   } else if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid) != 0) {
     if (StrSize (Buffer) > 0) {
       FreePool (mSemihostFsLabel);
diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.c b/ArmPkg/Library/SemihostLib/SemihostLib.c
index 87c0379d6b..53405edd7a 100644
--- a/ArmPkg/Library/SemihostLib/SemihostLib.c
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.c
@@ -1,7 +1,8 @@
 /** @file
 
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-  
+  Copyright (c) 2013 - 2014, ARM Ltd. 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
@@ -73,10 +74,12 @@ SemihostFileSeek (
 
   Result = Semihost_SYS_SEEK(&SeekBlock);
 
-  if (Result == 0) {
-    return RETURN_SUCCESS;
-  } else {
+  // Semihosting does not behave as documented. It returns the offset on
+  // success.
+  if (Result < 0) {
     return RETURN_ABORTED;
+  } else {
+    return RETURN_SUCCESS;
   }
 }
 
@@ -100,7 +103,7 @@ SemihostFileRead (
 
   Result = Semihost_SYS_READ(&ReadBlock);
 
-  if (Result == *Length) {
+  if ((*Length != 0) && (Result == *Length)) {
     return RETURN_ABORTED;
   } else {
     *Length -= Result;
@@ -126,8 +129,11 @@ SemihostFileWrite (
   WriteBlock.Length = *Length;
 
   *Length = Semihost_SYS_WRITE(&WriteBlock);
-  
-  return RETURN_SUCCESS;
+
+  if (*Length != 0)
+    return RETURN_ABORTED;
+  else
+    return RETURN_SUCCESS;
 }
 
 RETURN_STATUS
@@ -174,6 +180,11 @@ SemihostFileRemove (
   SEMIHOST_FILE_REMOVE_BLOCK  RemoveBlock;
   UINT32                      Result;
 
+  // Remove any leading separator (e.g.: '\'). EFI Shell adds one.
+  if (*FileName == '\\') {
+    FileName++;
+  }
+
   RemoveBlock.FileName    = FileName;
   RemoveBlock.NameLength  = AsciiStrLen(FileName);