V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

menu.c: use puts() instead of printf() where possible 

common/menu.c used printf() in a number of places to print user
provided, constant strings (like the "title" string).  printf() is
dangerous here for example in case the user unwittingly embeds some
'%' caracters that printf() would interpret as formatting and then
pick up random arguments.  Use puts() instead.

We also omit the trailing ':' in the title line - if a user wants
this, he can provide it as part of the title string.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-28 20:19:41 +01:00
parent 68435fa151
commit a63d965275
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/menu.c
View File

@ -87,10 +87,12 @@ static inline void *menu_item_print(struct menu *m,
struct menu_item *item, struct menu_item *item,
void *extra) void *extra)
{ {
if (!m->item_data_print) if (!m->item_data_print) {
printf("%s\n", item->key); putc(item->key);
else putc('\n');
} else {
m->item_data_print(item->data); m->item_data_print(item->data);
}
return NULL; return NULL;
} }
@ -117,8 +119,10 @@ static inline void *menu_item_destroy(struct menu *m,
*/ */
static inline void menu_display(struct menu *m) static inline void menu_display(struct menu *m)
{ {
if (m->title) if (m->title) {
printf("%s:\n", m->title); puts(m->title);
putc('\n');
}
menu_items_iter(m, menu_item_print, NULL); menu_items_iter(m, menu_item_print, NULL);
} }
@ -226,7 +230,7 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
if (!choice_item) if (!choice_item)
printf("%s not found\n", cbuf); printf("%s not found\n", cbuf);
} else { } else {
printf("^C\n"); puts("^C\n");
return -EINTR; return -EINTR;
} }
} }