mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: Fix guestfish -N option when called with unknown image type.

Browse Source 
Previously it was falling off the end of the loop if you
called it with an unknown image type.
This commit is contained in:
Richard Jones
2010-05-12 19:01:29 +01:00
parent 94e310dcfb
commit 520d895383
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fish/prep.c
View File

@@ -104,6 +104,8 @@ static const struct prep preps[] = {
},
};
#define nr_preps (sizeof preps / sizeof preps[0])
void
list_prepared_drives (void)
{
@@ -111,7 +113,7 @@ list_prepared_drives (void)
printf (_("List of available prepared disk images:\n\n"));
for (i = 0; i < sizeof preps / sizeof preps[0]; ++i) {
for (i = 0; i < nr_preps; ++i) {
printf (_("\
guestfish -N %-16s %s\n\
\n\
@@ -169,11 +171,11 @@ parse_type_string (const char *type_string)
/* Match on the type part (without parameters). */
size_t len = strcspn (type_string, ":");
for (i = 0; i < sizeof preps / sizeof preps[0]; ++i)
for (i = 0; i < nr_preps; ++i)
if (STRCASEEQLEN (type_string, preps[i].name, len))
break;
if (preps[i].name == NULL) {
if (i == nr_preps) {
fprintf (stderr, _("\
guestfish: -N parameter '%s': no such prepared disk image known.\n\
Use 'guestfish -N list' to list possible values for the -N parameter.\n"),