mirrors/genimage
0
0
Fork 0
mirror of https://github.com/pengutronix/genimage.git synced 2024-11-23 17:53:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

insert_data: use open() instead of fopen()

Browse Source 
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
This commit is contained in:
Michael Olbrich 2018-12-17 14:40:03 +01:00
parent d40873cc32
commit d3e2dc20d3
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util.c
View File

@ -376,20 +376,17 @@ err_out:
int insert_data(struct image *image, const char *data, const char *outfile,
size_t size, long offset)
{
FILE *outf = NULL;
int outf = -1;
int now, r;
int ret = 0;
outf = fopen(outfile, "r+");
if (!outf && errno == ENOENT)
outf = fopen(outfile, "w");
if (!outf) {
outf = open(outfile, O_WRONLY|O_CREAT, 0666);
if (outf < 0) {
ret = -errno;
image_error(image, "open %s: %s\n", outfile, strerror(errno));
goto err_out;
}
ret = fseek(outf, offset, SEEK_SET);
if (ret) {
if (lseek(outf, offset, SEEK_SET) < 0) {
ret = -errno;
image_error(image, "seek %s: %s\n", outfile, strerror(errno));
goto err_out;
@ -397,7 +394,7 @@ int insert_data(struct image *image, const char *data, const char *outfile,
while (size) {
now = min(size, 4096);
r = fwrite(data, 1, now, outf);
r = write(outf, data, now);
if (r < now) {
ret = -errno;
image_error(image, "write %s: %s\n", outfile, strerror(errno));
@ -407,8 +404,8 @@ int insert_data(struct image *image, const char *data, const char *outfile,
data += now;
}
err_out:
if (outf)
fclose(outf);
if (outf >= 0)
close(outf);
return ret;
}