hush: remove non-functional code
Subsystems (2)
PATCH 1/4 hush: remove non-functional code
name is unused except for printing and value is modified, but never read back. They currently serve no purpose, so drop them. The actual splitting by '=' happens in set_local_var later.
--- common/hush.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
common/hush.c +1 -8
@@ -798,16 +798,9 @@ static int run_pipe_real(struct p_context *ctx, struct pipe *pi)* This junk is all to decide whether or not to export this * variable. */ int export_me =0 ; -char *name, *value; - name =xstrdup (child->argv[i]); -hush_debug ("Local environment set: %s\n" , name); - value =strchr (name,'=' ); +hush_debug ("Local environment set: %s\n" , child->argv[i]); -if (value) - *value =0 ; - -free (name); p =insert_var_value (child->argv[i]); rcode =set_local_var (p, export_me);if (rcode)
Signature · 7 lines
2.28.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/4 commands: nv: fix set/remove of multiple variables in one go
Multiple nonopt arguments seems to have never worked, because the value was always extracted out of the first non-opt argument. After the first iteration, it'll have it's '=' stripped and thus value == NULL for all i
Quoted 1 line
0. Fix this.
Before:
$ nv a=1 b=2 c=3 $ echo "[$nv.a $nv.b $nv.c]" [1 ]
After:
$ nv a=1 b=2 c=3 $ echo "[$nv.a $nv.b $nv.c]" [1 2 3]
--- commands/nv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
commands/nv.c +1 -1
@@ -55,7 +55,7 @@ static int do_nv(int argc, char *argv[])for (i =0 ; i < argc; i++) {int ret; - value =strchr (argv[0 ],'=' ); + value =strchr (argv[i],'=' );if (value) { *value =0 ; value++;
Signature · 7 lines
2.28.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/4 commands: nv: pass empty string for nv
In reply to Ahmad FatoumSetting a variable via the nv command results in the call chain nvar_add() -> nv_save() -> __nv_save().
__nv_save isn't supposed to be called with val=NULL argument however:
dprintf(fd, "%s", val);
Avoid this from happening by translating NULL into the empty string. This aligns nv with the behavior of hush and setenv (but not global, this will need to be looked at separately).
--- commands/nv.c | 2 ++ 1 file changed, 2 insertions(+)
commands/nv.c +2 -0
@@ -59,6 +59,8 @@ static int do_nv(int argc, char *argv[])if (value) { *value =0 ; value++; + }else { + value ="" ; }if (do_remove) {
Signature · 7 lines
2.28.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/4 commands: implement and use parse_assignment helper
In reply to Ahmad FatoumWe have the split by '=' snippet at multiple locations that parse key=value pairs. Consolidate them to a single location. This makes code a bit easier to read at the cost of an extra 8 bytes (LZO-compressed THUMB2 barebox, static inline version is bigger).
No functional change.
--- commands/export.c | 4 +--- commands/global.c | 6 +----- commands/nv.c | 9 ++------- commands/setenv.c | 10 ++++------ common/bootchooser.c | 4 +--- common/fastboot.c | 4 +--- common/hush.c | 3 +-- include/command.h | 1 + include/string.h | 1 + lib/string.c | 11 +++++++++++ 10 files changed, 24 insertions(+), 29 deletions(-)
commands/export.c +1 -3
@@ -20,10 +20,8 @@ static int do_export(int argc, char *argv[])return COMMAND_ERROR_USAGE ;while (i < argc) { -if ((ptr =strchr (argv[i],'=' ))) { - *ptr++ =0 ; +if ((ptr =parse_assignment (argv[i])))setenv (argv[i], ptr); - }if (export (argv[i])) {printf ("could not export: %s\n" , argv[i]);return 1 ;
commands/global.c +1 -5
@@ -37,11 +37,7 @@ static int do_global(int argc, char *argv[])return COMMAND_ERROR_USAGE ;for (i =0 ; i < argc; i++) { - value =strchr (argv[i],'=' ); -if (value) { - *value =0 ; - value++; - } + value =parse_assignment (argv[i]);if (do_remove)globalvar_remove (argv[i]);
commands/nv.c +2 -7
@@ -55,13 +55,8 @@ static int do_nv(int argc, char *argv[])for (i =0 ; i < argc; i++) {int ret; - value =strchr (argv[i],'=' ); -if (value) { - *value =0 ; - value++; - }else { - value ="" ; - } + + value =parse_assignment (argv[i]) ?:"" ;if (do_remove) { ret =nvvar_remove (argv[i]);
commands/setenv.c +4 -6
@@ -9,17 +9,15 @@static int do_setenv (int argc,char *argv[]) { -char *equal; +char *val;int ret;if (argc <2 )return COMMAND_ERROR_USAGE ; - equal =strrchr (argv[1 ],'=' ); -if (equal) { - equal[0 ] ='\0' ; - argv[2 ] = &equal[1 ]; - } + val =parse_assignment (argv[1 ]); +if (val) + argv[2 ] = val;if (argv[2 ]) ret =setenv (argv[1 ], argv[2 ]);
common/bootchooser.c +1 -3
@@ -151,14 +151,12 @@ static int pr_setenv(struct bootchooser *bc, const char *fmt, ...)if (!str)return -ENOMEM ; - val =strchr (str,'=' ); + val =parse_assignment (str);if (!val) { ret = -EINVAL ; goto err; } - *val++ ='\0' ; - oldval =getenv (str);if (!oldval ||strcmp (oldval, val)) {if (bc->state)
common/fastboot.c +1 -3
@@ -823,14 +823,12 @@ static void cb_oem_setenv(struct fastboot *fb, const char *cmd)pr_debug ("%s: \"%s\"\n" , __func__, cmd); - value =strchr (var,'=' ); + value =parse_assignment (var);if (!value) { ret = -EINVAL ; goto out; } - *value++ =0 ; - ret =setenv (var, value);if (ret) goto out;
common/hush.c +1 -2
@@ -1117,12 +1117,11 @@ static int set_local_var(const char *s, int flg_export)/* Assume when we enter this function that we are already in * NAME=VALUE format. So the first order of business is to * split 's' on the '=' into 'name' and 'value' */ - value =strchr (name,'=' ); + value =parse_assignment (name);if (!value) {free (name);return -1 ; } - *value++ =0 ;remove_quotes_in_str (value);
include/command.h +1 -0
@@ -13,6 +13,7 @@#include <linux/list.h> #include <linux/stringify.h> #include <linux/stddef.h> +#include <string.h> #ifndef __ASSEMBLY__
include/string.h +1 -0
@@ -14,5 +14,6 @@ void *__nokasan_default_memset(void *, int, __kernel_size_t);void *__default_memcpy (void * dest,const void *src,size_t count);void *__nokasan_default_memcpy (void * dest,const void *src,size_t count); +char *parse_assignment (char *str);#endif /* __STRING_H */
lib/string.c +11 -0
@@ -899,3 +899,14 @@ int match_string(const char * const *array, size_t n, const char *string)return -EINVAL ; }EXPORT_SYMBOL (match_string); + +char *parse_assignment (char *str) +{ +char *value; + + value =strchr (str,'=' ); +if (value) + *value++ ='\0' ; + +return value; +}
Signature · 7 lines
2.28.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 8 lines · Ahmad Fatoum
name is unused except for printing and value is modified, but never read back. They currently serve no purpose, so drop them. The actual splitting by '=' happens in
set_local_varlater.Signed-off-by Ahmad Fatoum <[email protected]>--- common/hush.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
Applied, thanks
Sascha
Quoted 32 lines
common/hush.c +1
-8@@ -798,16 +798,9 @@ static int run_pipe_real(struct p_context *ctx, struct pipe *pi)* This junk is all to decide whether or not to export this * variable. */ int export_me =0 ; -char *name, *value; - name =xstrdup (child->argv[i]); -hush_debug ("Local environment set: %s\n" , name); - value =strchr (name,'=' ); +hush_debug ("Local environment set: %s\n" , child->argv[i]); -if (value) - *value =0 ; - -free (name); p =insert_var_value (child->argv[i]); rcode =set_local_var (p, export_me);if (rcode)Signature · 7 lines
2.28.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox