[PATCH 2/3] Handle absolute pathnames correctly in dtc_open_file.
David Gibson
david at gibson.dropbear.id.au
Sun Jan 6 14:37:16 EST 2008
On Fri, Jan 04, 2008 at 03:10:45PM -0600, Scott Wood wrote:
> Also, free file->dir when freeing file.
>
> Signed-off-by: Scott Wood <scottwood at freescale.com>
> ---
> srcpos.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/srcpos.c b/srcpos.c
> index 7340c33..7a0c47e 100644
> --- a/srcpos.c
> +++ b/srcpos.c
> @@ -86,6 +86,16 @@ struct dtc_file *dtc_open_file(const char *fname,
> return file;
> }
>
> + if (fname[0] == '/') {
> + file->file = fopen(fname, "r");
> +
> + if (!file->file)
> + goto out;
> +
> + file->name = strdup(fname);
> + return file;
> + }
> +
> if (!search)
> search = &default_search;
>
> @@ -100,6 +110,7 @@ struct dtc_file *dtc_open_file(const char *fname,
> }
>
> out:
> + free((void *)file->dir);
That cast shouldn't be there.
> free(file);
> return NULL;
> }
> @@ -109,5 +120,6 @@ void dtc_close_file(struct dtc_file *file)
> if (fclose(file->file))
> die("Error closing \"%s\": %s\n", file->name, strerror(errno));
>
> + free((void *)file->dir);
Or here.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
More information about the Linuxppc-dev
mailing list