mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 07:01:57 +00:00
x86: ifdtool: Display filename when file errors are reported
When a file is missing it helps to know which file. Update the error message to print this information. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
7e8ffa4ed8
commit
fa8d3b00f9
1 changed files with 18 additions and 12 deletions
|
@ -465,6 +465,16 @@ static int write_regions(char *image, int size)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int perror_fname(const char *fmt, const char *fname)
|
||||||
|
{
|
||||||
|
char msg[strlen(fmt) + strlen(fname) + 1];
|
||||||
|
|
||||||
|
sprintf(msg, fmt, fname);
|
||||||
|
perror(msg);
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* write_image() - Write the image to a file
|
* write_image() - Write the image to a file
|
||||||
*
|
*
|
||||||
|
@ -481,10 +491,10 @@ static int write_image(char *filename, char *image, int size)
|
||||||
|
|
||||||
new_fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR |
|
new_fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR |
|
||||||
S_IWUSR | S_IRGRP | S_IROTH);
|
S_IWUSR | S_IRGRP | S_IROTH);
|
||||||
if (write(new_fd, image, size) != size) {
|
if (new_fd < 0)
|
||||||
perror("Error while writing");
|
return perror_fname("Could not open file '%s'", filename);
|
||||||
return -1;
|
if (write(new_fd, image, size) != size)
|
||||||
}
|
return perror_fname("Could not write file '%s'", filename);
|
||||||
close(new_fd);
|
close(new_fd);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -586,14 +596,10 @@ int open_for_read(const char *fname, int *sizep)
|
||||||
int fd = open(fname, O_RDONLY);
|
int fd = open(fname, O_RDONLY);
|
||||||
struct stat buf;
|
struct stat buf;
|
||||||
|
|
||||||
if (fd == -1) {
|
if (fd == -1)
|
||||||
perror("Could not open file");
|
return perror_fname("Could not open file '%s'", fname);
|
||||||
return -1;
|
if (fstat(fd, &buf) == -1)
|
||||||
}
|
return perror_fname("Could not stat file '%s'", fname);
|
||||||
if (fstat(fd, &buf) == -1) {
|
|
||||||
perror("Could not stat file");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
*sizep = buf.st_size;
|
*sizep = buf.st_size;
|
||||||
debug("File %s is %d bytes\n", fname, *sizep);
|
debug("File %s is %d bytes\n", fname, *sizep);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue