Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Temp File Use #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Temp File Use #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 19 additions & 24 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#include <sys/un.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include <sys/sendfile.h>

#include "mtd.h"
#include "plat_boot_config.h"
Expand Down Expand Up @@ -555,33 +554,29 @@ int update_main(int argc, char **argv)
return 0;
}

static char *tmp_file = ".tmp_kobs_ng";
static char *padding_1k_in_head(char *file_name)
static FILE *padding_1k_in_head(FILE *from)
{
int to, from;
int ret;
int sz = getpagesize();
FILE *to;
char buf[BUFSIZ];
size_t size;

from = open(file_name, O_RDONLY, S_IRUSR | S_IWUSR);
to = open(tmp_file, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
if (from < 0 || to < 0) {
to = tmpfile();
if (from == NULL || to == NULL) {
fprintf(stderr, "unable to create a temporary file\n");
exit(5);
}

/* Padding 1k in the head. */
lseek(to, 1024, SEEK_SET);
fseek(to, 1024, SEEK_SET);

do {
/* copy a page each time. */
ret = sendfile(to, from, NULL, sz);
} while (ret > 0);
while ((size = fread(buf, 1, BUFSIZ, from)) > 0) {
fwrite(buf, 1, size, to);
}

close(to);
close(from);
fclose(from);

/* change to the temporary file. */
return tmp_file;
return to;
}

int init_main(int argc, char **argv)
Expand Down Expand Up @@ -670,19 +665,19 @@ int init_main(int argc, char **argv)
* So we have to add the 1k-padding ourselves.
* Note: We only burn the uboot to nand in the kernel 3.5.7.
*/
if (padding) {
infile = padding_1k_in_head(infile);

if (flags & F_VERBOSE)
printf("\t -- We add the 1k-padding to the uboot.\n");
}

infp = fopen(infile, "rb");
if (infp == NULL) {
fprintf(stderr, "Unable to open input file '%s'\n", infile);
usage();
}

if (padding) {
infp = padding_1k_in_head(infp);

if (flags & F_VERBOSE)
printf("\t -- We add the 1k-padding to the uboot.\n");
}

keyp = !device_key ? key : NULL;

if (flags & F_VERBOSE)
Expand Down