sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Sascha Hauer 2012-03-18 17:59:46 +01:00
parent 1e2cc03914
commit 2d2ec6619b
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/fs.c
View File

@ -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;
}

5
fs/tftp.c
View File

@ -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);

2
include/fs.h
View File

@ -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