diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-18 17:59:46 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-20 08:42:46 +0200 |
commit | 2d2ec6619b84fd70ceaa5f4a347c428ff24339ad (patch) | |
tree | 09d43c20189826110822f3bb3b33ab78483804cf | |
parent | 1e2cc039145bf41c1472eb17411622642017bac0 (diff) | |
download | barebox-2d2ec6619b84fd70ceaa5f4a347c428ff24339ad.tar.gz barebox-2d2ec6619b84fd70ceaa5f4a347c428ff24339ad.tar.xz |
read_file: Make it work on tftp servers which do not pass size
Some tftp servers (for example netkit-tftp) do not pass the filesize.
Add a workaround for read_file which reads the file into a temporary
file which then is copied to a buffer.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | fs/fs.c | 18 | ||||
-rw-r--r-- | fs/tftp.c | 5 | ||||
-rw-r--r-- | include/fs.h | 2 |
3 files changed, 24 insertions, 1 deletions
@@ -38,10 +38,21 @@ void *read_file(const char *filename, size_t *size) int fd; struct stat s; void *buf = NULL; + const char *tmpfile = "/.read_file_tmp"; + int ret; +again: if (stat(filename, &s)) return NULL; + if (s.st_size == FILESIZE_MAX) { + ret = copy_file(filename, tmpfile, 0); + if (ret) + return NULL; + filename = tmpfile; + goto again; + } + buf = xzalloc(s.st_size + 1); fd = open(filename, O_RDONLY); @@ -56,12 +67,19 @@ void *read_file(const char *filename, size_t *size) if (size) *size = s.st_size; + if (filename == tmpfile) + unlink(tmpfile); + return buf; err_out1: close(fd); err_out: free(buf); + + if (filename == tmpfile) + unlink(tmpfile); + return NULL; } @@ -598,7 +598,10 @@ static int tftp_stat(struct device_d *dev, const char *filename, struct stat *s) return PTR_ERR(priv); s->st_mode = S_IFREG | S_IRWXU | S_IRWXG | S_IRWXO; - s->st_size = priv->filesize; + if (priv->filesize) + s->st_size = priv->filesize; + else + s->st_size = FILESIZE_MAX; tftp_do_close(priv); diff --git a/include/fs.h b/include/fs.h index 7c4e46175a..22c07467da 100644 --- a/include/fs.h +++ b/include/fs.h @@ -149,6 +149,8 @@ int protect(int fd, size_t count, unsigned long offset, int prot); int protect_file(const char *file, int prot); void *memmap(int fd, int flags); +#define FILESIZE_MAX ((loff_t)-1) + #define PROT_READ 1 #define PROT_WRITE 2 |