mirror of https://github.com/xemu-project/xemu.git
linux-user: Replace bprm->fd with bprm->src.fd
There are only a couple of uses of bprm->fd remaining. Migrate to the other field. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
86cf82dc9f
commit
d0b6b79323
|
@ -463,7 +463,7 @@ static int load_flat_file(struct linux_binprm * bprm,
|
|||
DBG_FLT("BINFMT_FLAT: ROM mapping of file (we hope)\n");
|
||||
|
||||
textpos = target_mmap(0, text_len, PROT_READ|PROT_EXEC,
|
||||
MAP_PRIVATE, bprm->fd, 0);
|
||||
MAP_PRIVATE, bprm->src.fd, 0);
|
||||
if (textpos == -1) {
|
||||
fprintf(stderr, "Unable to mmap process text\n");
|
||||
return -1;
|
||||
|
@ -490,7 +490,7 @@ static int load_flat_file(struct linux_binprm * bprm,
|
|||
} else
|
||||
#endif
|
||||
{
|
||||
result = target_pread(bprm->fd, datapos,
|
||||
result = target_pread(bprm->src.fd, datapos,
|
||||
data_len + (relocs * sizeof(abi_ulong)),
|
||||
fpos);
|
||||
}
|
||||
|
@ -540,10 +540,10 @@ static int load_flat_file(struct linux_binprm * bprm,
|
|||
else
|
||||
#endif
|
||||
{
|
||||
result = target_pread(bprm->fd, textpos,
|
||||
result = target_pread(bprm->src.fd, textpos,
|
||||
text_len, 0);
|
||||
if (result >= 0) {
|
||||
result = target_pread(bprm->fd, datapos,
|
||||
result = target_pread(bprm->src.fd, datapos,
|
||||
data_len + (relocs * sizeof(abi_ulong)),
|
||||
ntohl(hdr->data_start));
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
|
|||
int mode;
|
||||
int retval;
|
||||
|
||||
if (fstat(bprm->fd, &st) < 0) {
|
||||
if (fstat(bprm->src.fd, &st) < 0) {
|
||||
return -errno;
|
||||
}
|
||||
|
||||
|
@ -69,7 +69,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
|
|||
bprm->e_gid = st.st_gid;
|
||||
}
|
||||
|
||||
retval = read(bprm->fd, bprm->buf, BPRM_BUF_SIZE);
|
||||
retval = read(bprm->src.fd, bprm->buf, BPRM_BUF_SIZE);
|
||||
if (retval < 0) {
|
||||
perror("prepare_binprm");
|
||||
exit(-1);
|
||||
|
@ -144,7 +144,6 @@ int loader_exec(int fdexec, const char *filename, char **argv, char **envp,
|
|||
{
|
||||
int retval;
|
||||
|
||||
bprm->fd = fdexec;
|
||||
bprm->src.fd = fdexec;
|
||||
bprm->filename = (char *)filename;
|
||||
bprm->argc = count(argv);
|
||||
|
|
|
@ -74,7 +74,6 @@ struct linux_binprm {
|
|||
char buf[BPRM_BUF_SIZE] __attribute__((aligned));
|
||||
ImageSource src;
|
||||
abi_ulong p;
|
||||
int fd;
|
||||
int e_uid, e_gid;
|
||||
int argc, envc;
|
||||
char **argv;
|
||||
|
|
Loading…
Reference in New Issue