u-boot environments, esp. when boards are shared across multiple users, can get pretty large and time consuming to visually parse. The grepenv command this patch adds can be used in lieu of printenv to facilitate searching. grepenv works like printenv but limits its output only to environment strings (variable name and value pairs) that match the user specified substring.
Signed-off-by: Kim Phillips kim.phillips@freescale.com --- common/cmd_nvedit.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- common/command.c | 1 + 2 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 13325bc..c4bde27 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -4,7 +4,9 @@ * * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel aheppel@sysgo.de - + * + * Copyright 2010 Freescale Semiconductor, Inc. + * * See file CREDITS for list of people who contributed to this * project. * @@ -139,6 +141,50 @@ static int printenv(char *name, int state) return i; }
+int do_grepenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + char buf[CONFIG_SYS_CBSIZE], *searchstr; + int i = 0, j = 0, k = 0; + int rcode = 1; + + if (argc != 2) { + cmd_usage(cmdtp); + return 1; + } + + searchstr = argv[1]; + + /* find and print matching env vars */ + do { + buf[j] = env_get_char(i); + if (buf[j] == searchstr[k]) { + k++; + if (searchstr[k] == '\0') { + /* match complete */ + rcode = 0; + do { + i++; j++; + buf[j] = env_get_char(i); + } while (buf[j] != '\0'); + puts(buf); puts("\n"); + j = 0; k = 0; + } else + j++; + } else { + k = 0; + if (buf[j] == '\0') { + j = 0; + if (ctrlc()) + return -1; + } else + j++; + } + i++; + } while (!(j == 0 && env_get_char(i) == '\0')); + + return rcode; +} + int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int i; @@ -634,6 +680,13 @@ U_BOOT_CMD( );
U_BOOT_CMD( + grepenv, 2, 0, do_grepenv, + "search environment", + "fixed-string\n" + " - list environment name and value pairs matching 'fixed-string'" +); + +U_BOOT_CMD( setenv, CONFIG_SYS_MAXARGS, 0, do_setenv, "set environment variables", "name value ...\n" diff --git a/common/command.c b/common/command.c index a1fc592..305bda0 100644 --- a/common/command.c +++ b/common/command.c @@ -191,6 +191,7 @@ void install_auto_complete(void) #if defined(CONFIG_CMD_EDITENV) install_auto_complete_handler("editenv", var_complete); #endif + install_auto_complete_handler("grepenv", var_complete); install_auto_complete_handler("printenv", var_complete); install_auto_complete_handler("setenv", var_complete); #if defined(CONFIG_CMD_RUN)