aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael S.Carvalho <raphael.scarv@gmail.com>2013-09-17 16:52:10 -0300
committerMatt Fleming <matt.fleming@intel.com>2013-09-30 15:43:37 +0100
commita176e98a7be72c17c103c5bd7ca1cf94c66e63ad (patch)
tree8c9457178c2286fcc851b008e52a56c9024e4c1d
parent639d33bcac11fd2d4db0668e8455d5086a4e48f1 (diff)
downloadsyslinux-a176e98a7be72c17c103c5bd7ca1cf94c66e63ad.tar.gz
syslinux-a176e98a7be72c17c103c5bd7ca1cf94c66e63ad.tar.xz
syslinux-a176e98a7be72c17c103c5bd7ca1cf94c66e63ad.zip
com32: Fix a bug on history of commands.
Previously, even zero-length commands would be added to the history when they shoudn't, e.g: just typing enter. For example, if you type: FOO -> (ENTER) -> (ENTER), then to get FOO from the history you would have to press the UP key twice. It also saves a bit of memory. Signed-off-by: Raphael S.Carvalho <raphael.scarv@gmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--com32/elflink/ldlinux/cli.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c
index a50124c3..6ff30c64 100644
--- a/com32/elflink/ldlinux/cli.c
+++ b/com32/elflink/ldlinux/cli.c
@@ -461,11 +461,14 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
printf("\033[?7h");
- /* Add the command to the history */
- comm_counter = malloc(sizeof(struct cli_command));
- comm_counter->command = malloc(sizeof(char) * (strlen(ret) + 1));
- strcpy(comm_counter->command, ret);
- list_add(&(comm_counter->list), &cli_history_head);
+ /* Add the command to the history if its length is larger than 0 */
+ len = strlen(ret);
+ if (len > 0) {
+ comm_counter = malloc(sizeof(struct cli_command));
+ comm_counter->command = malloc(sizeof(char) * (len + 1));
+ strcpy(comm_counter->command, ret);
+ list_add(&(comm_counter->list), &cli_history_head);
+ }
return len ? ret : NULL;
}