sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-25 00:17:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

[cmdline] Add generic concat_args() function

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2011-03-07 18:31:38 +00:00
parent 9e162121b1
commit a281c4080b
3 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/hci/commands/image_cmd.c
View File

@@ -39,37 +39,24 @@ FILE_LICENCE ( GPL2_OR_LATER );
* Fill in image command line
*
* @v image Image
* @v nargs Argument count
* @v args Argument list
* @ret rc Return status code
*/
static int imgfill_cmdline ( struct image *image, unsigned int nargs,
char **args ) {
size_t len = 0;
unsigned int i;
static int imgfill_cmdline ( struct image *image, char **args ) {
char *cmdline = NULL;
int rc;
/* Clear command line if no arguments given */
if ( ! nargs )
return image_set_cmdline ( image, NULL );
/* Determine total length of command line */
for ( i = 0 ; i < nargs ; i++ )
len += ( strlen ( args[i] ) + 1 /* space or NUL */ );
{
char buf[len];
char *ptr = buf;
/* Assemble command line */
buf[0] = '\0';
for ( i = 0 ; i < nargs ; i++ ) {
ptr += sprintf ( ptr, "%s%s", ( i ? " " : "" ),
args[i] );
}
assert ( ptr < ( buf + len ) );
return image_set_cmdline ( image, buf );
/* Construct command line (if arguments are present) */
if ( *args ) {
cmdline = concat_args ( args );
if ( ! cmdline )
return -ENOMEM;
}
/* Apply command line */
rc = image_set_cmdline ( image, cmdline );
free ( cmdline );
return rc;
}
/** "imgfetch" options */
@@ -127,8 +114,7 @@ static int imgfetch_core_exec ( int argc, char **argv,
return rc;
/* Fill in command line */
if ( ( rc = imgfill_cmdline ( image, ( argc - optind - 1 ),
&argv[ optind + 1 ] ) ) != 0 )
if ( ( rc = imgfill_cmdline ( image, &argv[ optind + 1 ] ) ) != 0 )
return rc;
/* Fetch the image */
@@ -255,8 +241,7 @@ static int imgargs_exec ( int argc, char **argv ) {
return rc;
/* Fill in command line */
if ( ( rc = imgfill_cmdline ( image, ( argc - optind - 1 ),
&argv[ optind + 1 ] ) ) != 0 )
if ( ( rc = imgfill_cmdline ( image, &argv[ optind + 1 ] ) ) != 0 )
return rc;
return 0;