sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

menu: Use strdup instead of malloc/strncpy 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2010-08-21 17:02:09 +02:00
parent 86086c5faa
commit f371f04df2
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
commands/menu.c
View File

@ -67,7 +67,6 @@ static int do_menu_entry_add(struct cmd_menu *cm)
{
struct menu_entry *me;
struct menu *m, *sm;
int len;
int ret = -ENOMEM;
if (!cm->menu || (!cm->command && !cm->submenu) || !cm->description)
@ -99,25 +98,15 @@ static int do_menu_entry_add(struct cmd_menu *cm)
} else {
me->action = menu_action_run;
len = strlen(cm->command) + 1;
me->priv = calloc(len, sizeof(char));
me->priv = strdup(cm->command);
if (!me->priv)
goto free;
strncpy(me->priv, cm->command, len);
}
len = strlen(cm->description) + 1;
me->display = calloc(len, sizeof(char));;
if (!m->display)
me->display = strdup(cm->description);
if (!me->display)
goto free;
strncpy(me->display, cm->description, len);
ret = menu_add_entry(m, me);
if (ret)
@ -175,7 +164,6 @@ static int do_menu_entry_remove(struct cmd_menu *cm)
static int do_menu_add(struct cmd_menu *cm)
{
struct menu *m;
int len = 0;
int ret = -ENOMEM;
if (!cm->menu || !cm->description)
@ -186,23 +174,14 @@ static int do_menu_add(struct cmd_menu *cm)
if (!m)
goto free;
len = strlen(cm->menu) + 1;
m->name = calloc(len, sizeof(char));;
m->name = strdup(cm->menu);
if (!m->name)
goto free;
strncpy(m->name, cm->menu, len);
len = strlen(cm->description) + 1;
m->display = calloc(len, sizeof(char));;
m->display = strdup(cm->description);
if (!m->display)
goto free;
strncpy(m->display, cm->description, len);
ret = menu_add(m);
if (ret)