diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2018-07-24 16:24:23 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2018-07-24 16:24:23 -0400 |
| commit | ca6b8577754558ed790dd305d9579d7d5ed72091 (patch) | |
| tree | f4aef8def509710b9e5a73ca4fb7105e439636a8 /lib/shell.c | |
| parent | 3802e1ad5adf91f955b9f1408950e28bad10d830 (diff) | |
| parent | f892ac66084ab0315adb0c52e4a39b518730d023 (diff) | |
| download | efi-boot-shim-ca6b8577754558ed790dd305d9579d7d5ed72091.tar.gz efi-boot-shim-ca6b8577754558ed790dd305d9579d7d5ed72091.zip | |
Update upstream source from tag 'upstream/15+1531942534.dd3230d'
Update to upstream version '15+1531942534.dd3230d'
with Debian dir 8b167be00338c76b0ddc9164059ce6090c274641
Diffstat (limited to 'lib/shell.c')
| -rw-r--r-- | lib/shell.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/shell.c b/lib/shell.c index afd3952c..e46e7fd2 100644 --- a/lib/shell.c +++ b/lib/shell.c @@ -8,22 +8,23 @@ #include <efi.h> #include <efilib.h> -#include <shell.h> +#include "shim.h" EFI_STATUS argsplit(EFI_HANDLE image, int *argc, CHAR16*** ARGV) { unsigned int i, count = 1; - EFI_STATUS status; + EFI_STATUS efi_status; EFI_LOADED_IMAGE *info; CHAR16 *start; *argc = 0; - status = uefi_call_wrapper(BS->HandleProtocol, 3, image, &LoadedImageProtocol, (VOID **) &info); - if (EFI_ERROR(status)) { - Print(L"Failed to get arguments\n"); - return status; + efi_status = gBS->HandleProtocol(image, &LoadedImageProtocol, + (VOID **) &info); + if (EFI_ERROR(efi_status)) { + console_print(L"Failed to get arguments\n"); + return efi_status; } for (i = 0; i < info->LoadOptionsSize; i += 2) { @@ -33,7 +34,8 @@ argsplit(EFI_HANDLE image, int *argc, CHAR16*** ARGV) } } - (*argc)++; /* we counted spaces, so add one for initial */ + /* we counted spaces, so add one for initial */ + (*argc)++; *ARGV = AllocatePool(*argc * sizeof(**ARGV)); if (!*ARGV) { |