david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[settings] Use concat_args() in "set" command 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2011-03-22 17:29:08 +00:00
parent f5fd4dec3b
commit aebba8f6eb
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/hci/commands/nvo_cmd.c
View File

@ -99,42 +99,38 @@ static struct command_descriptor set_cmd =
static int set_exec ( int argc, char **argv ) {
struct set_options opts;
const char *name;
size_t len;
int i;
char *value;
int rc;
/* Parse options */
if ( ( rc = parse_options ( argc, argv, &set_cmd, &opts ) ) != 0 )
return rc;
goto err_parse_options;
/* Parse setting name */
name = argv[optind];
/* Determine total length of command line */
len = 1; /* NUL */
for ( i = optind + 1 ; i < argc ; i++ )
len += ( 1 /* possible space */ + strlen ( argv[i] ) );
{
char buf[len];
char *ptr = buf;
/* Assemble command line */
buf[0] = '\0';
for ( i = optind + 1 ; i < argc ; i++ ) {
ptr += sprintf ( ptr, "%s%s", ( buf[0] ? " " : "" ),
argv[i] );
}
assert ( ptr < ( buf + len ) );
if ( ( rc = storef_named_setting ( name, buf ) ) != 0 ) {
printf ( "Could not set \"%s\"=\"%s\": %s\n",
name, buf, strerror ( rc ) );
return rc;
}
/* Parse setting value */
value = concat_args ( &argv[ optind + 1 ] );
if ( ! value ) {
rc = -ENOMEM;
goto err_concat_args;
}
/* Determine total length of command line */
if ( ( rc = storef_named_setting ( name, value ) ) != 0 ) {
printf ( "Could not set \"%s\"=\"%s\": %s\n",
name, value, strerror ( rc ) );
goto err_store;
}
free ( value );
return 0;
err_store:
free ( value );
err_concat_args:
err_parse_options:
return rc;
}
/** "clear" options */

1
src/include/ipxe/errfile.h
View File

@ -238,6 +238,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define ERRFILE_sanboot_cmd ( ERRFILE_OTHER | 0x00200000 )
#define ERRFILE_bofm ( ERRFILE_OTHER | 0x00210000 )
#define ERRFILE_prompt ( ERRFILE_OTHER | 0x00220000 )
#define ERRFILE_nvo_cmd ( ERRFILE_OTHER | 0x00230000 )
/** @} */