Make echo UTF-8-clean
PATCH 1/1 Make echo UTF-8-clean
While working on my previous patch, I noticed that echo wasn't
UTF-8-clean: the UTF-8 character 'à' was coming out as "??". This patch fixes that.
2010-12-21 Colin Watson <[email protected]>
* grub-core/commands/echo.c (grub_cmd_echo): Make UTF-8-clean by constructing a new unescaped string and passing it to grub_xputs in one go, rather than passing characters to grub_printf one at a time.
=== modified file 'grub-core/commands/echo.c'
commands/echo.c +15 -8
@@ -44,6 +44,9 @@ grub_cmd_echo (grub_extcmd_context_t ctxfor (i =0 ; i < argc; i++) {char *arg = *args; +/* Unescaping results in a string no longer than the original. */ +char *unescaped =grub_malloc (grub_strlen (arg) +1 ); +char *p = unescaped; args++;while (*arg)
@@ -58,11 +61,11 @@ grub_cmd_echo (grub_extcmd_context_t ctxswitch (*arg) {case '\\' : -grub_printf ("\\" ); + *p++ ='\\' ;break ;case 'a' : -grub_printf ("\a" ); + *p++ ='\a' ;break ;case 'c' :
@@ -70,23 +73,23 @@ grub_cmd_echo (grub_extcmd_context_t ctxbreak ;case 'f' : -grub_printf ("\f" ); + *p++ ='\f' ;break ;case 'n' : -grub_printf ("\n" ); + *p++ ='\n' ;break ;case 'r' : -grub_printf ("\r" ); + *p++ ='\r' ;break ;case 't' : -grub_printf ("\t" ); + *p++ ='\t' ;break ;case 'v' : -grub_printf ("\v" ); + *p++ ='\v' ;break ; } arg++;
@@ -95,10 +98,14 @@ grub_cmd_echo (grub_extcmd_context_t ctx/* This was not an escaped character, or escaping is not enabled. */ -grub_printf ("%c" , *arg); + *p++ = *arg; arg++; } + *p ='\0' ; +grub_xputs (unescaped); +grub_free (unescaped); +/* If another argument follows, insert a space. */ if (i != argc -1 )grub_printf (" " );
Signature · 1 line
Colin Watson [[email protected]]