diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/echo.c | 49 | ||||
| -rw-r--r-- | cmd/efidebug.c | 12 | ||||
| -rw-r--r-- | cmd/load.c | 12 |
3 files changed, 31 insertions, 42 deletions
diff --git a/cmd/echo.c b/cmd/echo.c index d02a4cfd586..fda844ee9d3 100644 --- a/cmd/echo.c +++ b/cmd/echo.c @@ -10,47 +10,34 @@ static int do_echo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - int i; - int putnl = 1; - - for (i = 1; i < argc; i++) { - char *p = argv[i]; - char *nls; /* new-line suppression */ + int i = 1; + bool space = false; + bool newline = true; + + if (argc > 1) { + if (!strcmp(argv[1], "-n")) { + newline = false; + ++i; + } + } - if (i > 1) + for (; i < argc; ++i) { + if (space) { putc(' '); - - nls = strstr(p, "\\c"); - if (nls) { - char *prenls = p; - - putnl = 0; - /* - * be paranoid and guess that someone might - * say \c more than once - */ - while (nls) { - *nls = '\0'; - puts(prenls); - *nls = '\\'; - prenls = nls + 2; - nls = strstr(prenls, "\\c"); - } - puts(prenls); - } else { - puts(p); } + puts(argv[i]); + space = true; } - if (putnl) + if (newline) putc('\n'); return 0; } U_BOOT_CMD( - echo, CONFIG_SYS_MAXARGS, 1, do_echo, + echo, CONFIG_SYS_MAXARGS, 1, do_echo, "echo args to console", - "[args..]\n" - " - echo args to console; \\c suppresses newline" + "[-n] [args..]\n" + " - echo args to console; -n suppresses newline" ); diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 9a2d4ddd5ef..83bc2196a5a 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -189,14 +189,16 @@ static int do_efi_capsule_res(struct cmd_tbl *cmdtp, int flag, ret = EFI_CALL(RT->get_variable(var_name16, &guid, NULL, &size, NULL)); if (ret == EFI_BUFFER_TOO_SMALL) { result = malloc(size); + if (!result) + return CMD_RET_FAILURE; ret = EFI_CALL(RT->get_variable(var_name16, &guid, NULL, &size, result)); - if (ret != EFI_SUCCESS) { - free(result); - printf("Failed to get %ls\n", var_name16); + } + if (ret != EFI_SUCCESS) { + free(result); + printf("Failed to get %ls\n", var_name16); - return CMD_RET_FAILURE; - } + return CMD_RET_FAILURE; } printf("Result total size: 0x%x\n", result->variable_total_size); diff --git a/cmd/load.c b/cmd/load.c index c6a7cc46515..f252c748948 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -1065,25 +1065,25 @@ U_BOOT_CMD( U_BOOT_CMD( loadb, 3, 0, do_load_serial_bin, "load binary file over serial line (kermit mode)", - "[ off ] [ baud ]\n" + "[ addr [ baud ] ]\n" " - load binary file over serial line" - " with offset 'off' and baudrate 'baud'" + " at address 'addr' with baudrate 'baud'" ); U_BOOT_CMD( loadx, 3, 0, do_load_serial_bin, "load binary file over serial line (xmodem mode)", - "[ off ] [ baud ]\n" + "[ addr [ baud ] ]\n" " - load binary file over serial line" - " with offset 'off' and baudrate 'baud'" + " at address 'addr' with baudrate 'baud'" ); U_BOOT_CMD( loady, 3, 0, do_load_serial_bin, "load binary file over serial line (ymodem mode)", - "[ off ] [ baud ]\n" + "[ addr [ baud ] ]\n" " - load binary file over serial line" - " with offset 'off' and baudrate 'baud'" + " at address 'addr' with baudrate 'baud'" ); #endif /* CONFIG_CMD_LOADB */ |