setenv: do console redirection even if previously unset
PATCH 1/1 setenv: do console redirection even if previously unset
From: Alessandro Rubini <[email protected]>
If "stdout" is not previously set, doing "setenv stdout lcd" had no effect, since console redirection only worked if the environment variable was already set; the second time you run setenv it worked. Most default environments lack stdin/out/err definitions, so I'm sure I'm not alone with this problem.
This patch simply moves a block of code out of a conditional, to do the same work even if the variable was previously unset.
--- common/cmd_nvedit.c | 62 +++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 31 deletions(-)
common/cmd_nvedit.c +31 -31
@@ -202,6 +202,37 @@ int _do_setenv (int flag, int argc, char *argv[])break ; } +/* Check for console redirection */ +if (strcmp (name,"stdin" ) ==0 ) { + console = stdin; + }else if (strcmp (name,"stdout" ) ==0 ) { + console = stdout; + }else if (strcmp (name,"stderr" ) ==0 ) { + console = stderr; + } + +if (console !=-1 ) { +if (argc <3 ) {/* Cannot delete it! */ +printf ("Can't delete \"%s\"\n" , name); +return 1 ; + } + +#ifdef CONFIG_CONSOLE_MUX + i =iomux_doenv (console, argv[2 ]); +if (i) +return i; +#else +/* Try assigning specified device */ +if (console_assign (console, argv[2 ]) <0 ) +return 1 ; + +#ifdef CONFIG_SERIAL_MULTI +if (serial_assign (argv[2 ]) <0 ) +return 1 ; +#endif +#endif /* CONFIG_CONSOLE_MUX */ + } +/* * Delete any existing definition */
@@ -229,37 +260,6 @@ int _do_setenv (int flag, int argc, char *argv[]) }#endif -/* Check for console redirection */ -if (strcmp (name,"stdin" ) ==0 ) { - console = stdin; - }else if (strcmp (name,"stdout" ) ==0 ) { - console = stdout; - }else if (strcmp (name,"stderr" ) ==0 ) { - console = stderr; - } - -if (console !=-1 ) { -if (argc <3 ) {/* Cannot delete it! */ -printf ("Can't delete \"%s\"\n" , name); -return 1 ; - } - -#ifdef CONFIG_CONSOLE_MUX - i =iomux_doenv (console, argv[2 ]); -if (i) -return i; -#else -/* Try assigning specified device */ -if (console_assign (console, argv[2 ]) <0 ) -return 1 ; - -#ifdef CONFIG_SERIAL_MULTI -if (serial_assign (argv[2 ]) <0 ) -return 1 ; -#endif -#endif /* CONFIG_CONSOLE_MUX */ - } -/* * Switch to new baudrate if new baudrate is supported */
Signature · 1 line
1.6.0.2
Wolfgang Denk
AppliedPATCH 1/1 setenv: do console redirection even if previously unset
Dear Alessandro Rubini,
Quoted 8 lines · In message <[email protected]> you wrote:
From: Alessandro Rubini <[email protected]>
If "stdout" is not previously set, doing "setenv stdout lcd" had no effect, since console redirection only worked if the environment variable was already set; the second time you run setenv it worked. Most default environments lack stdin/out/err definitions, so I'm sure I'm not alone with this problem.
Quoted 8 lines
This patch simply moves a block of code out of a conditional, to do the same work even if the variable was previously unset.
Signed-off-by Alessandro Rubini <[email protected]>Acked-by Andrea Gallo <[email protected]>--- common/cmd_nvedit.c | 62 +++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 31 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
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 Our business is run on trust. We trust you will pay in advance.