diff options
| -rw-r--r-- | fish/fish.c | 38 | ||||
| -rw-r--r-- | fish/fish.h | 3 | ||||
| -rw-r--r-- | fish/prep.c | 14 |
3 files changed, 53 insertions, 2 deletions
diff --git a/fish/fish.c b/fish/fish.c index 9ca57be1..de11b2fe 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -73,6 +73,8 @@ static void set_up_terminal (void); static char add_drives (struct drv *drv, char next_drive); static void prepare_drives (struct drv *drv); static void mount_mps (struct mp *mp); +static void free_drives (struct drv *drv); +static void free_mps (struct mp *mp); static int launch (void); static void interactive (void); static void shell_script (void); @@ -485,6 +487,10 @@ main (int argc, char *argv[]) mount_mps (mps); } + /* Free up data structures, no longer needed after this point. */ + free_drives (drvs); + free_mps (mps); + /* Remote control? */ if (remote_control_listen && remote_control) { fprintf (stderr, @@ -688,6 +694,38 @@ prepare_drives (struct drv *drv) } } +static void +free_drives (struct drv *drv) +{ + if (!drv) return; + free_drives (drv->next); + + switch (drv->type) { + case drv_a: free (drv->a.filename); break; + case drv_d: free (drv->d.guest); break; + case drv_N: + free (drv->N.filename); + free (drv->N.device); + free_prep_data (drv->N.data); + break; + default: ; /* keep GCC happy */ + } + free (drv); +} + +static void +free_mps (struct mp *mp) +{ + if (!mp) return; + free_mps (mp->next); + + /* The drive and mountpoint fields are not allocated + * from the heap, so we should not free them here. + */ + + free (mp); +} + static int launch (void) { diff --git a/fish/fish.h b/fish/fish.h index 609cbc29..f6e1aeb9 100644 --- a/fish/fish.h +++ b/fish/fish.h @@ -124,7 +124,7 @@ extern int run_more (const char *cmd, int argc, char *argv[]); struct prep_data { const struct prep *prep; const char *orig_type_string; - const char **params; + char **params; }; typedef struct prep_data prep_data; extern void list_prepared_drives (void); @@ -133,6 +133,7 @@ extern prep_data *create_prepared_file (const char *type_string, extern void prepare_drive (const char *filename, prep_data *data, const char *device); extern void prep_error (prep_data *data, const char *filename, const char *fs, ...) __attribute__((noreturn, format (printf,3,4))); +extern void free_prep_data (prep_data *data); /* in prep_lv.c */ extern int vg_lv_parse (const char *device, char **vg, char **lv); diff --git a/fish/prep.c b/fish/prep.c index 8b830719..9a6b64ed 100644 --- a/fish/prep.c +++ b/fish/prep.c @@ -116,7 +116,7 @@ Use 'guestfish -N help' 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,15 @@ prep_error (prep_data *data, const char *filename, const char *fs, ...) exit (EXIT_FAILURE); } + +void +free_prep_data (prep_data *data) +{ + 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); +} |