X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fprep.c;h=9863bc9699e119c3c339f134ef7a749792e8cfe7;hb=b5f90793026832889cae3d4997810cb34777cf9a;hp=369dd6d43c1e103983d08af6168ab2447e08a638;hpb=60cdd02b02578b427ca3926d566811c6bb7a9970;p=libguestfs.git

diff --git a/fish/prep.c b/fish/prep.c
index 369dd6d..9863bc9 100644
--- a/fish/prep.c
+++ b/fish/prep.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -38,7 +38,7 @@ list_prepared_drives (void)
 
   for (i = 0; i < NR_PREPS; ++i) {
     printf (_("\
-guestfish -N %-16s %s\n\
+guestfish -N %-8s - %s\n\
 \n\
 %s\n"),
             preps[i].name, preps[i].shortdesc, preps[i].longdesc);
@@ -95,7 +95,7 @@ parse_type_string (const char *type_string)
   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"),
+Use 'guestfish -N help' to list possible values for the -N parameter.\n"),
              type_string);
     exit (EXIT_FAILURE);
   }
@@ -116,7 +116,7 @@ Use 'guestfish -N list' to list possible values for the -N parameter.\n"),
   }
 
   for (i = 0; i < data->prep->nr_params; ++i)
-    data->params[i] = data->prep->params[i].pdefault;
+    data->params[i] = bad_cast (data->prep->params[i].pdefault);
 
   /* Parse the optional parameters. */
   const char *p = type_string + len;
@@ -167,3 +167,16 @@ prep_error (prep_data *data, const char *filename, const char *fs, ...)
 
   exit (EXIT_FAILURE);
 }
+
+void
+free_prep_data (void *vp)
+{
+  prep_data *data = vp;
+  size_t i;
+
+  for (i = 0; i < data->prep->nr_params; ++i)
+    if (data->params[i] != data->prep->params[i].pdefault)
+      free (data->params[i]);
+  free (data->params);
+  free (data);
+}