* [U-Boot] [PATCH v2] common: add a grepenv command @ 2011-04-01 22:46 Kim Phillips 2011-04-01 22:59 ` Wolfgang Denk 2011-04-01 23:06 ` Mike Frysinger 0 siblings, 2 replies; 10+ messages in thread From: Kim Phillips @ 2011-04-01 22:46 UTC (permalink / raw) To: u-boot 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> --- v2: rebased common/cmd_nvedit.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c24..532167b 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -160,6 +160,49 @@ int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; } +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; +} /* * Set a new environment variable, * or replace or delete an existing one. @@ -904,6 +947,14 @@ U_BOOT_CMD_COMPLETE( ); U_BOOT_CMD_COMPLETE( + grepenv, 2, 0, do_grepenv, + "search environment", + "fixed-string\n" + " - list environment name and value pairs matching 'fixed-string'", + var_complete +); + +U_BOOT_CMD_COMPLETE( setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, "set environment variables", "name value ...\n" -- 1.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2] common: add a grepenv command 2011-04-01 22:46 [U-Boot] [PATCH v2] common: add a grepenv command Kim Phillips @ 2011-04-01 22:59 ` Wolfgang Denk 2011-04-01 23:06 ` Mike Frysinger 1 sibling, 0 replies; 10+ messages in thread From: Wolfgang Denk @ 2011-04-01 22:59 UTC (permalink / raw) To: u-boot Dear Kim Phillips, In message <20110401174658.eaa8d773.kim.phillips@freescale.com> you wrote: > 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. It would be nice if you gave an example of how to use this. > +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; > + } Why don't you allow for an arbitrary number of arguments here? > + /* find and print matching env vars */ > + do { > + buf[j] = env_get_char(i); ... > + } while (!(j == 0 && env_get_char(i) == '\0')); This does not work as you might expect. The current environment cannot be parsed like that, becuase it is not stored in a linear list any more, but in a hash table instead. You may be lucky on some systems (especially NOR flash based ones) to read the last saved data from the persistent storage, but this is NOT the current environment. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Deliver yesterday, code today, think tomorrow." ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2] common: add a grepenv command 2011-04-01 22:46 [U-Boot] [PATCH v2] common: add a grepenv command Kim Phillips 2011-04-01 22:59 ` Wolfgang Denk @ 2011-04-01 23:06 ` Mike Frysinger 2011-04-04 19:45 ` [U-Boot] [PATCH v3] " Kim Phillips 1 sibling, 1 reply; 10+ messages in thread From: Mike Frysinger @ 2011-04-01 23:06 UTC (permalink / raw) To: u-boot On Fri, Apr 1, 2011 at 6:46 PM, Kim Phillips wrote: > 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. please add a proper #ifdef like CONFIG_CMD_GREPENV and do not enable it by default. > +int do_grepenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static > + ? ? ? char buf[CONFIG_SYS_CBSIZE], *searchstr; i dont think that is correct usage of this define -mike ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v3] common: add a grepenv command 2011-04-01 23:06 ` Mike Frysinger @ 2011-04-04 19:45 ` Kim Phillips 2011-04-04 20:57 ` Wolfgang Denk 0 siblings, 1 reply; 10+ messages in thread From: Kim Phillips @ 2011-04-04 19:45 UTC (permalink / raw) To: u-boot 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. the following examples are on a board with a 5313 byte environment that spans multiple screen pages: Example 1: summarize ethernet configuration: => grepenv eth TSEC etact=FM1 at DTSEC2 eth=FM1 at DTSEC4 ethact=FM1 at DTSEC2 eth1addr=00:E0:0C:00:8b:01 eth2addr=00:E0:0C:00:8b:02 eth3addr=00:E0:0C:00:8b:03 eth4addr=00:E0:0C:00:8b:04 eth5addr=00:E0:0C:00:8b:05 eth6addr=00:E0:0C:00:8b:06 eth7addr=00:E0:0C:00:8b:07 eth8addr=00:E0:0C:00:8b:08 eth9addr=00:E0:0C:00:8b:09 ethaddr=00:E0:0C:00:8b:00 netdev=eth0 uprcw=setenv ethact $eth;setenv filename p4080ds/R_PPSXX_0xe/rcw_0xe_2sgmii_rev2_high.bin;setenv start 0xe8000000;protect off all;run upimage;protect on all upuboot=setenv ethact $eth;setenv filename u-boot.bin;setenv start eff80000;protect off all;run upimage;protect on all upucode=setenv ethact $eth;setenv filename fsl_fman_ucode_P4080_101_6.bin;setenv start 0xef000000;protect off all;run upimage;protect on all usdboot=setenv ethact $eth;tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/initramfs.cpio.gz.uboot;tftp c00000 $dir/p4080ds-usdpaa.dtb;setenv bootargs root=/dev/ram rw console=ttyS0,115200 $othbootargs;bootm 1000000 2000000 c00000; => Example 2: detect unused env vars: => grepenv etact etact=FM1 at DTSEC2 => Example 3: reveal hardcoded variables; e.g., for fdtaddr: => grepenv fdtaddr fdtaddr=c00000 nfsboot=setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr ramboot=setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr => grep $fdtaddr fdtaddr=c00000 my_boot=bootm 0x40000000 0x41000000 0x00c00000 my_dtb=tftp 0x00c00000 $prefix/p4080ds.dtb nohvboot=tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/$ramdiskfile;tftp c00000 $dir/$fdtfile;setenv bootargs root=/dev/ram rw ramdisk_size=0x10000000 console=ttyS0,115200;bootm 1000000 2000000 c00000; => This patch also enables the grepenv command by default on corenet_ds based boards (and repositions the DHCP command entry to keep the list sorted). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Kumar Gala <kumar.gala@freescale.com> Cc: Andy Fleming <afleming@freescale.com> --- v2: rebase v3: address comments from Mike Frysinger, Wolfgang Denk: - hexport first, so as to always get current environment - handle multiple strings per invocation, in an OR fashion, uniquify output - add a proper #ifdef like CONFIG_CMD_GREPENV, only enabled by default on corenet_ds systems - don't use dubious CONFIG_SYS_CBSIZE - use hexported memory - assign index variables better names than i,j,k. - provide usage examples in commit text - add copyright README | 1 + common/cmd_nvedit.c | 70 +++++++++++++++++++++++++++++++++++++++++- include/configs/corenet_ds.h | 3 +- 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/README b/README index 21cd71b..a66ce73 100644 --- a/README +++ b/README @@ -643,6 +643,7 @@ The following options need to be configured: CONFIG_CMD_FDOS * Dos diskette Support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support + CONFIG_CMD_GREPENV * search environment CONFIG_CMD_HWFLOW * RTS/CTS hw flow control CONFIG_CMD_I2C * I2C serial bus support CONFIG_CMD_IDE * IDE harddisk support diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c24..2eb0a6d 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 2011 Freescale Semiconductor, Inc. + * * See file CREDITS for list of people who contributed to this * project. * @@ -160,6 +162,62 @@ int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; } +#ifdef CONFIG_CMD_GREPENV +static int do_env_grep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + char *searchstr, *res = NULL; + int len, envidx, beginline, lineidx, matchidx; + int rcode = 1; + + if (argc < 2) { + cmd_usage(cmdtp); + return 1; + } + + len = hexport_r(&env_htab, '\0', &res, 0); + + while (--argc) { + envidx = 0; beginline = 0; lineidx = 0; matchidx = 0; + searchstr = argv[argc]; + + /* find and print matching env vars */ + do { + if (res[lineidx] == searchstr[matchidx]) { + matchidx++; + if (searchstr[matchidx] == '\0') { + /* match complete */ + rcode = 0; + puts(&res[beginline]); + puts("\n"); + /* uniquify multiple argv hits */ + while (res[beginline]) + res[beginline++] = '\0'; + envidx = beginline; + lineidx = envidx + 1; + beginline = lineidx; + matchidx = 0; + } else + lineidx++; + } else { + matchidx = 0; + if (res[lineidx] == '\0') { + lineidx = envidx + 1; + beginline = lineidx; + if (ctrlc()) + return -1; + } else + lineidx++; + } + envidx++; + } while (envidx < len); + } + + free(res); + + return rcode; +} +#endif + /* * Set a new environment variable, * or replace or delete an existing one. @@ -903,6 +961,16 @@ U_BOOT_CMD_COMPLETE( var_complete ); +#ifdef CONFIG_CMD_GREPENV +U_BOOT_CMD_COMPLETE( + grepenv, CONFIG_SYS_MAXARGS, 0, do_env_grep, + "search environment variables", + "string ...\n" + " - list environment name=value pairs matching 'string'", + var_complete +); +#endif + U_BOOT_CMD_COMPLETE( setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, "set environment variables", diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index bff212e..53facf2 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -473,14 +473,15 @@ */ #include <config_cmd_default.h> +#define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA +#define CONFIG_CMD_GREPENV #define CONFIG_CMD_IRQ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_DHCP #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -- 1.7.4.2.dirty ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v3] common: add a grepenv command 2011-04-04 19:45 ` [U-Boot] [PATCH v3] " Kim Phillips @ 2011-04-04 20:57 ` Wolfgang Denk 2011-04-05 1:18 ` [U-Boot] [PATCH v4] " Kim Phillips 0 siblings, 1 reply; 10+ messages in thread From: Wolfgang Denk @ 2011-04-04 20:57 UTC (permalink / raw) To: u-boot Dear Kim Phillips, In message <20110404144518.41716465.kim.phillips@freescale.com> you wrote: > 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. Wishlist: add options to restrict search on variable name resp. value only. > v3: address comments from Mike Frysinger, Wolfgang Denk: > - hexport first, so as to always get current environment Oops. This was not the way I expected you to change the code. Can you please operate on the hash table data instead? See for example commit 560d424 for how to iterate over the variables. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Karl's version of Parkinson's Law: Work expands to exceed the time alloted it. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v4] common: add a grepenv command 2011-04-04 20:57 ` Wolfgang Denk @ 2011-04-05 1:18 ` Kim Phillips 2011-04-05 15:00 ` Peter Tyser 0 siblings, 1 reply; 10+ messages in thread From: Kim Phillips @ 2011-04-05 1:18 UTC (permalink / raw) To: u-boot 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. the following examples are on a board with a 5313 byte environment that spans multiple screen pages: Example 1: summarize ethernet configuration: => grepenv eth TSEC etact=FM1 at DTSEC2 eth=FM1 at DTSEC4 ethact=FM1 at DTSEC2 eth1addr=00:E0:0C:00:8b:01 eth2addr=00:E0:0C:00:8b:02 eth3addr=00:E0:0C:00:8b:03 eth4addr=00:E0:0C:00:8b:04 eth5addr=00:E0:0C:00:8b:05 eth6addr=00:E0:0C:00:8b:06 eth7addr=00:E0:0C:00:8b:07 eth8addr=00:E0:0C:00:8b:08 eth9addr=00:E0:0C:00:8b:09 ethaddr=00:E0:0C:00:8b:00 netdev=eth0 uprcw=setenv ethact $eth;setenv filename p4080ds/R_PPSXX_0xe/rcw_0xe_2sgmii_rev2_high.bin;setenv start 0xe8000000;protect off all;run upimage;protect on all upuboot=setenv ethact $eth;setenv filename u-boot.bin;setenv start eff80000;protect off all;run upimage;protect on all upucode=setenv ethact $eth;setenv filename fsl_fman_ucode_P4080_101_6.bin;setenv start 0xef000000;protect off all;run upimage;protect on all usdboot=setenv ethact $eth;tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/initramfs.cpio.gz.uboot;tftp c00000 $dir/p4080ds-usdpaa.dtb;setenv bootargs root=/dev/ram rw console=ttyS0,115200 $othbootargs;bootm 1000000 2000000 c00000; => Example 2: detect unused env vars: => grepenv etact etact=FM1 at DTSEC2 => Example 3: reveal hardcoded variables; e.g., for fdtaddr: => grepenv fdtaddr fdtaddr=c00000 nfsboot=setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr ramboot=setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr => grep $fdtaddr fdtaddr=c00000 my_boot=bootm 0x40000000 0x41000000 0x00c00000 my_dtb=tftp 0x00c00000 $prefix/p4080ds.dtb nohvboot=tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/$ramdiskfile;tftp c00000 $dir/$fdtfile;setenv bootargs root=/dev/ram rw ramdisk_size=0x10000000 console=ttyS0,115200;bootm 1000000 2000000 c00000; => This patch also enables the grepenv command by default on corenet_ds based boards (and repositions the DHCP command entry to keep the list sorted). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Kumar Gala <kumar.gala@freescale.com> Cc: Andy Fleming <afleming@freescale.com> --- v2: rebase v3: address comments from Mike Frysinger, Wolfgang Denk: - hexport first, so as to always get current environment - handle multiple strings per invocation, in an OR fashion, uniquify output - add a proper #ifdef like CONFIG_CMD_GREPENV, only enabled by default on corenet_ds systems - don't use dubious CONFIG_SYS_CBSIZE - use hexported memory - assign index variables better names than i,j,k. - provide usage examples in commit text - add copyright v4: change to use commit 560d424 as guidance for how to iterate directly over the variables in the hash table README | 1 + common/cmd_nvedit.c | 47 +++++++++++++++++++++++++++++++++++++++++- include/configs/corenet_ds.h | 3 +- include/search.h | 6 +++++ lib/hashtable.c | 23 ++++++++++++++++++++ 5 files changed, 78 insertions(+), 2 deletions(-) diff --git a/README b/README index 21cd71b..a66ce73 100644 --- a/README +++ b/README @@ -643,6 +643,7 @@ The following options need to be configured: CONFIG_CMD_FDOS * Dos diskette Support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support + CONFIG_CMD_GREPENV * search environment CONFIG_CMD_HWFLOW * RTS/CTS hw flow control CONFIG_CMD_I2C * I2C serial bus support CONFIG_CMD_IDE * IDE harddisk support diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c24..cc16b09 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 2011 Freescale Semiconductor, Inc. + * * See file CREDITS for list of people who contributed to this * project. * @@ -160,6 +162,39 @@ int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; } +#ifdef CONFIG_CMD_GREPENV +static int do_env_grep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + ENTRY *match; + int matched[env_htab.size]; + int rcode = 1, idx; + + if (argc < 2) { + cmd_usage(cmdtp); + return 1; + } + + for (idx = 0; idx < env_htab.size; idx++) + matched[idx] = 0; + + while (--argc) { + idx = 0; + while ((idx = hstrstr_r(argv[argc], idx, &match, &env_htab))) { + if (!matched[idx]) { + puts(match->key); + puts("="); + puts(match->data); + puts("\n"); + } + matched[idx] = 1; + rcode = 0; + } + } + + return rcode; +} +#endif + /* * Set a new environment variable, * or replace or delete an existing one. @@ -903,6 +938,16 @@ U_BOOT_CMD_COMPLETE( var_complete ); +#ifdef CONFIG_CMD_GREPENV +U_BOOT_CMD_COMPLETE( + grepenv, CONFIG_SYS_MAXARGS, 0, do_env_grep, + "search environment variables", + "string ...\n" + " - list environment name=value pairs matching 'string'", + var_complete +); +#endif + U_BOOT_CMD_COMPLETE( setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, "set environment variables", diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index bff212e..53facf2 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -473,14 +473,15 @@ */ #include <config_cmd_default.h> +#define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA +#define CONFIG_CMD_GREPENV #define CONFIG_CMD_IRQ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_DHCP #ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/search.h b/include/search.h index a7c1293..c827d4d 100644 --- a/include/search.h +++ b/include/search.h @@ -80,6 +80,12 @@ extern int hsearch_r(ENTRY __item, ACTION __action, ENTRY ** __retval, */ extern int hmatch_r(const char *__match, int __last_idx, ENTRY ** __retval, struct hsearch_data *__htab); +/* + * Search for an entry whose key or data contains `MATCH'. Otherwise, + * Same semantics as hsearch_r(). + */ +extern int hstrstr_r(const char *__match, int __last_idx, ENTRY ** __retval, + struct hsearch_data *__htab); /* Search and delete entry matching ITEM.key in internal hash table. */ extern int hdelete_r(const char *__key, struct hsearch_data *__htab); diff --git a/lib/hashtable.c b/lib/hashtable.c index 92eaa38..19d5b15 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -202,6 +202,29 @@ void hdestroy_r(struct hsearch_data *htab) * example for functions like hdelete(). */ +/* + * hstrstr_r - return index to entry whose key and/or data contains match + */ +int hstrstr_r(const char *match, int last_idx, ENTRY ** retval, + struct hsearch_data *htab) +{ + unsigned int idx; + + for (idx = last_idx + 1; idx < htab->size; ++idx) { + if (htab->table[idx].used <= 0) + continue; + if (strstr(htab->table[idx].entry.key, match) || + strstr(htab->table[idx].entry.data, match)) { + *retval = &htab->table[idx].entry; + return idx; + } + } + + __set_errno(ESRCH); + *retval = NULL; + return 0; +} + int hmatch_r(const char *match, int last_idx, ENTRY ** retval, struct hsearch_data *htab) { -- 1.7.4.2.dirty ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v4] common: add a grepenv command 2011-04-05 1:18 ` [U-Boot] [PATCH v4] " Kim Phillips @ 2011-04-05 15:00 ` Peter Tyser 2011-04-05 15:46 ` Mike Frysinger 0 siblings, 1 reply; 10+ messages in thread From: Peter Tyser @ 2011-04-05 15:00 UTC (permalink / raw) To: u-boot Hi Kim, > +#ifdef CONFIG_CMD_GREPENV > +static int do_env_grep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > +{ > + ENTRY *match; > + int matched[env_htab.size]; > + int rcode = 1, idx; > + > + if (argc < 2) { > + cmd_usage(cmdtp); > + return 1; > + } This could be: if (argc < 2) return cmd_usage(cmdtp); > + for (idx = 0; idx < env_htab.size; idx++) > + matched[idx] = 0; memset()? <snip> > +#ifdef CONFIG_CMD_GREPENV > +U_BOOT_CMD_COMPLETE( > + grepenv, CONFIG_SYS_MAXARGS, 0, do_env_grep, > + "search environment variables", > + "string ...\n" > + " - list environment name=value pairs matching 'string'", > + var_complete > +); > +#endif Support for "env grep" should also be added to the "env" command in cmd_nvedit.c. My understanding was that the individual printenv, setenv, etc commands were deprecated in favor of the unified "env" command. Cool feature! Peter ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v4] common: add a grepenv command 2011-04-05 15:00 ` Peter Tyser @ 2011-04-05 15:46 ` Mike Frysinger 2011-04-05 17:15 ` [U-Boot] [PATCH v5] " Kim Phillips 0 siblings, 1 reply; 10+ messages in thread From: Mike Frysinger @ 2011-04-05 15:46 UTC (permalink / raw) To: u-boot On Tue, Apr 5, 2011 at 11:00 AM, Peter Tyser wrote: >> +#ifdef CONFIG_CMD_GREPENV >> +static int do_env_grep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >> +{ >> + ? ? ENTRY *match; >> + ? ? int matched[env_htab.size]; >> + ? ? int rcode = 1, idx; >> + >> + ? ? if (argc < 2) { >> + ? ? ? ? ? ? cmd_usage(cmdtp); >> + ? ? ? ? ? ? return 1; >> + ? ? } > > This could be: > if (argc < 2) > ? ? ? ?return cmd_usage(cmdtp); s/could/should/ -mike ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v5] common: add a grepenv command 2011-04-05 15:46 ` Mike Frysinger @ 2011-04-05 17:15 ` Kim Phillips 2011-04-27 22:57 ` Wolfgang Denk 0 siblings, 1 reply; 10+ messages in thread From: Kim Phillips @ 2011-04-05 17:15 UTC (permalink / raw) To: u-boot 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. the following examples are on a board with a 5313 byte environment that spans multiple screen pages: Example 1: summarize ethernet configuration: => grepenv eth TSEC etact=FM1 at DTSEC2 eth=FM1 at DTSEC4 ethact=FM1 at DTSEC2 eth1addr=00:E0:0C:00:8b:01 eth2addr=00:E0:0C:00:8b:02 eth3addr=00:E0:0C:00:8b:03 eth4addr=00:E0:0C:00:8b:04 eth5addr=00:E0:0C:00:8b:05 eth6addr=00:E0:0C:00:8b:06 eth7addr=00:E0:0C:00:8b:07 eth8addr=00:E0:0C:00:8b:08 eth9addr=00:E0:0C:00:8b:09 ethaddr=00:E0:0C:00:8b:00 netdev=eth0 uprcw=setenv ethact $eth;setenv filename p4080ds/R_PPSXX_0xe/rcw_0xe_2sgmii_rev2_high.bin;setenv start 0xe8000000;protect off all;run upimage;protect on all upuboot=setenv ethact $eth;setenv filename u-boot.bin;setenv start eff80000;protect off all;run upimage;protect on all upucode=setenv ethact $eth;setenv filename fsl_fman_ucode_P4080_101_6.bin;setenv start 0xef000000;protect off all;run upimage;protect on all usdboot=setenv ethact $eth;tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/initramfs.cpio.gz.uboot;tftp c00000 $dir/p4080ds-usdpaa.dtb;setenv bootargs root=/dev/ram rw console=ttyS0,115200 $othbootargs;bootm 1000000 2000000 c00000; => Example 2: detect unused env vars: => grepenv etact etact=FM1 at DTSEC2 => Example 3: reveal hardcoded variables; e.g., for fdtaddr: => grepenv fdtaddr fdtaddr=c00000 nfsboot=setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr ramboot=setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr => grep $fdtaddr fdtaddr=c00000 my_boot=bootm 0x40000000 0x41000000 0x00c00000 my_dtb=tftp 0x00c00000 $prefix/p4080ds.dtb nohvboot=tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/$ramdiskfile;tftp c00000 $dir/$fdtfile;setenv bootargs root=/dev/ram rw ramdisk_size=0x10000000 console=ttyS0,115200;bootm 1000000 2000000 c00000; => This patch also enables the grepenv command by default on corenet_ds based boards (and repositions the DHCP command entry to keep the list sorted). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Kumar Gala <kumar.gala@freescale.com> Cc: Andy Fleming <afleming@freescale.com> --- v2: rebase v3: address comments from Mike Frysinger, Wolfgang Denk: - hexport first, so as to always get current environment - handle multiple strings per invocation, in an OR fashion, uniquify output - add a proper #ifdef like CONFIG_CMD_GREPENV, only enabled by default on corenet_ds systems - don't use dubious CONFIG_SYS_CBSIZE - use hexported memory - assign index variables better names than i,j,k. - provide usage examples in commit text - add copyright v4: change to use commit 560d424 as guidance for how to iterate directly over the variables in the hash table v5: comments from Peter Tyser: - add "env grep" to the "env" command - use memset for matched also in v5: - make 'already matched' an array of bits instead of ints to reduce stack usage - perform in-order argument matching -- previous version would search for last token first - fix spelling whilst in there: environmnt->environment README | 1 + common/cmd_nvedit.c | 55 +++++++++++++++++++++++++++++++++++++++-- include/configs/corenet_ds.h | 3 +- include/search.h | 6 ++++ lib/hashtable.c | 23 +++++++++++++++++ 5 files changed, 84 insertions(+), 4 deletions(-) diff --git a/README b/README index bd03523..29e56b7 100644 --- a/README +++ b/README @@ -643,6 +643,7 @@ The following options need to be configured: CONFIG_CMD_FDOS * Dos diskette Support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support + CONFIG_CMD_GREPENV * search environment CONFIG_CMD_HWFLOW * RTS/CTS hw flow control CONFIG_CMD_I2C * I2C serial bus support CONFIG_CMD_IDE * IDE harddisk support diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c24..5e9a19d 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 2011 Freescale Semiconductor, Inc. + * * See file CREDITS for list of people who contributed to this * project. * @@ -160,6 +162,37 @@ int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; } +#ifdef CONFIG_CMD_GREPENV +static int do_env_grep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + ENTRY *match; + unsigned char matched[env_htab.size / 8]; + int rcode = 1, arg = 1, idx; + + if (argc < 2) + return cmd_usage(cmdtp); + + memset(matched, 0, env_htab.size / 8); + + while (arg <= argc) { + idx = 0; + while ((idx = hstrstr_r(argv[arg], idx, &match, &env_htab))) { + if (!(matched[idx / 8] & (1 << (idx & 7)))) { + puts(match->key); + puts("="); + puts(match->data); + puts("\n"); + } + matched[idx / 8] |= 1 << (idx & 7); + rcode = 0; + } + arg++; + } + + return rcode; +} +#endif + /* * Set a new environment variable, * or replace or delete an existing one. @@ -823,6 +856,9 @@ static cmd_tbl_t cmd_env_sub[] = { U_BOOT_CMD_MKENT(edit, 2, 0, do_env_edit, "", ""), #endif U_BOOT_CMD_MKENT(export, 4, 0, do_env_export, "", ""), +#if defined(CONFIG_CMD_GREPENV) + U_BOOT_CMD_MKENT(grep, CONFIG_SYS_MAXARGS, 1, do_env_grep, "", ""), +#endif U_BOOT_CMD_MKENT(import, 5, 0, do_env_import, "", ""), U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_env_print, "", ""), #if defined(CONFIG_CMD_RUN) @@ -870,8 +906,11 @@ U_BOOT_CMD( #if defined(CONFIG_CMD_EDITENV) "env edit name - edit environment variable\n" #endif - "env export [-t | -b | -c] addr [size] - export environmnt\n" - "env import [-d] [-t | -b | -c] addr [size] - import environmnt\n" + "env export [-t | -b | -c] addr [size] - export environment\n" +#if defined(CONFIG_CMD_GREPENV) + "env grep string [...] - search environment\n" +#endif + "env import [-d] [-t | -b | -c] addr [size] - import environment\n" "env print [name ...] - print environment\n" #if defined(CONFIG_CMD_RUN) "env run var [...] - run commands in an environment variable\n" @@ -903,6 +942,16 @@ U_BOOT_CMD_COMPLETE( var_complete ); +#ifdef CONFIG_CMD_GREPENV +U_BOOT_CMD_COMPLETE( + grepenv, CONFIG_SYS_MAXARGS, 0, do_env_grep, + "search environment variables", + "string ...\n" + " - list environment name=value pairs matching 'string'", + var_complete +); +#endif + U_BOOT_CMD_COMPLETE( setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, "set environment variables", diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 7bafa05..032bb26 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -474,14 +474,15 @@ */ #include <config_cmd_default.h> +#define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA +#define CONFIG_CMD_GREPENV #define CONFIG_CMD_IRQ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_DHCP #ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/search.h b/include/search.h index a7c1293..c827d4d 100644 --- a/include/search.h +++ b/include/search.h @@ -80,6 +80,12 @@ extern int hsearch_r(ENTRY __item, ACTION __action, ENTRY ** __retval, */ extern int hmatch_r(const char *__match, int __last_idx, ENTRY ** __retval, struct hsearch_data *__htab); +/* + * Search for an entry whose key or data contains `MATCH'. Otherwise, + * Same semantics as hsearch_r(). + */ +extern int hstrstr_r(const char *__match, int __last_idx, ENTRY ** __retval, + struct hsearch_data *__htab); /* Search and delete entry matching ITEM.key in internal hash table. */ extern int hdelete_r(const char *__key, struct hsearch_data *__htab); diff --git a/lib/hashtable.c b/lib/hashtable.c index fcdb53c..2788a65 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -202,6 +202,29 @@ void hdestroy_r(struct hsearch_data *htab) * example for functions like hdelete(). */ +/* + * hstrstr_r - return index to entry whose key and/or data contains match + */ +int hstrstr_r(const char *match, int last_idx, ENTRY ** retval, + struct hsearch_data *htab) +{ + unsigned int idx; + + for (idx = last_idx + 1; idx < htab->size; ++idx) { + if (htab->table[idx].used <= 0) + continue; + if (strstr(htab->table[idx].entry.key, match) || + strstr(htab->table[idx].entry.data, match)) { + *retval = &htab->table[idx].entry; + return idx; + } + } + + __set_errno(ESRCH); + *retval = NULL; + return 0; +} + int hmatch_r(const char *match, int last_idx, ENTRY ** retval, struct hsearch_data *htab) { -- 1.7.4.2.dirty ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v5] common: add a grepenv command 2011-04-05 17:15 ` [U-Boot] [PATCH v5] " Kim Phillips @ 2011-04-27 22:57 ` Wolfgang Denk 0 siblings, 0 replies; 10+ messages in thread From: Wolfgang Denk @ 2011-04-27 22:57 UTC (permalink / raw) To: u-boot Dear Kim Phillips, In message <20110405121514.8641e889.kim.phillips@freescale.com> you wrote: > 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. > > the following examples are on a board with a 5313 byte environment > that spans multiple screen pages: ... > README | 1 + > common/cmd_nvedit.c | 55 +++++++++++++++++++++++++++++++++++++++-- > include/configs/corenet_ds.h | 3 +- > include/search.h | 6 ++++ > lib/hashtable.c | 23 +++++++++++++++++ > 5 files changed, 84 insertions(+), 4 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Lispers are among the best grads of the Sweep-It-Under-Someone- Else's-Carpet School of Simulated Simplicity. [Was that sufficiently incendiary? :-)] - Larry Wall in <1992Jan10.201804.11926@netlabs.com ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-04-27 22:57 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-04-01 22:46 [U-Boot] [PATCH v2] common: add a grepenv command Kim Phillips 2011-04-01 22:59 ` Wolfgang Denk 2011-04-01 23:06 ` Mike Frysinger 2011-04-04 19:45 ` [U-Boot] [PATCH v3] " Kim Phillips 2011-04-04 20:57 ` Wolfgang Denk 2011-04-05 1:18 ` [U-Boot] [PATCH v4] " Kim Phillips 2011-04-05 15:00 ` Peter Tyser 2011-04-05 15:46 ` Mike Frysinger 2011-04-05 17:15 ` [U-Boot] [PATCH v5] " Kim Phillips 2011-04-27 22:57 ` Wolfgang Denk
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.