//\r
// if we have space save it...\r
//\r
- if ((CountSoFar + 1) * CharSize < *Size){\r
+ if ((CountSoFar+1)*sizeof(CHAR16) < *Size){\r
ASSERT(Buffer != NULL);\r
- if (*Ascii) {\r
- ((CHAR8*)Buffer)[CountSoFar] = (CHAR8) CharBuffer;\r
- ((CHAR8*)Buffer)[CountSoFar+1] = '\0';\r
- }\r
- else {\r
- ((CHAR16*)Buffer)[CountSoFar] = CharBuffer;\r
- ((CHAR16*)Buffer)[CountSoFar+1] = CHAR_NULL;\r
- }\r
+ ((CHAR16*)Buffer)[CountSoFar] = CharBuffer;\r
+ ((CHAR16*)Buffer)[CountSoFar+1] = CHAR_NULL;\r
}\r
}\r
\r
//\r
// if we ran out of space tell when...\r
//\r
- if (Status != EFI_END_OF_FILE){\r
- if ((CountSoFar + 1) * CharSize > *Size){\r
- *Size = (CountSoFar + 1) * CharSize;\r
- if (!Truncate) {\r
- gEfiShellProtocol->SetFilePosition(Handle, OriginalFilePosition);\r
- } else {\r
- DEBUG((DEBUG_WARN, "The line was truncated in ShellFileHandleReadLine"));\r
- }\r
- return (EFI_BUFFER_TOO_SMALL);\r
- }\r
-\r
- if (*Ascii) {\r
- if (CountSoFar && ((CHAR8*)Buffer)[CountSoFar - 1] == '\r') {\r
- ((CHAR8*)Buffer)[CountSoFar - 1] = '\0';\r
- }\r
- }\r
- else {\r
- if (CountSoFar && Buffer[CountSoFar - 1] == L'\r') {\r
- Buffer[CountSoFar - 1] = CHAR_NULL;\r
- }\r
+ if ((CountSoFar+1)*sizeof(CHAR16) > *Size){\r
+ *Size = (CountSoFar+1)*sizeof(CHAR16);\r
+ if (!Truncate) {\r
+ gEfiShellProtocol->SetFilePosition(Handle, OriginalFilePosition);\r
+ } else {\r
+ DEBUG((DEBUG_WARN, "The line was truncated in ShellFileHandleReadLine"));\r
}\r
+ return (EFI_BUFFER_TOO_SMALL);\r
+ }\r
+ while(Buffer[StrLen(Buffer)-1] == L'\r') {\r
+ Buffer[StrLen(Buffer)-1] = CHAR_NULL;\r
}\r
\r
return (Status);\r