david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-user: remove useless variable

Browse Source 
filename is only used to open the file if AT_EXECFD is not provided.
But exec_path already contains the path of the file to open.
Remove filename as it is only used in main.c whereas exec_path is
also used in syscall.c.

Fixes: d088d664f201 ("linux-user: identify running binary in /proc/self/exe")
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20190714134028.315-1-laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Laurent Vivier 2019-07-14 15:40:27 +02:00
parent 89ea03a7dc
commit 9d3019bce3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux-user/main.c
View File

@ -49,7 +49,6 @@
char *exec_path; char *exec_path;
int singlestep; int singlestep;
static const char *filename;
static const char *argv0; static const char *argv0;
static int gdbstub_port; static int gdbstub_port;
static envlist_t *envlist; static envlist_t *envlist;
@ -586,7 +585,6 @@ static int parse_args(int argc, char **argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
filename = argv[optind];
exec_path = argv[optind]; exec_path = argv[optind];
return optind; return optind;
@ -657,9 +655,9 @@ int main(int argc, char **argv, char **envp)
execfd = qemu_getauxval(AT_EXECFD); execfd = qemu_getauxval(AT_EXECFD);
if (execfd == 0) { if (execfd == 0) {
execfd = open(filename, O_RDONLY); execfd = open(exec_path, O_RDONLY);
if (execfd < 0) { if (execfd < 0) {
printf("Error while loading %s: %s\n", filename, strerror(errno)); printf("Error while loading %s: %s\n", exec_path, strerror(errno));
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }
} }
@ -784,10 +782,10 @@ int main(int argc, char **argv, char **envp)
cpu->opaque = ts; cpu->opaque = ts;
task_settid(ts); task_settid(ts);
ret = loader_exec(execfd, filename, target_argv, target_environ, regs, ret = loader_exec(execfd, exec_path, target_argv, target_environ, regs,
info, &bprm); info, &bprm);
if (ret != 0) { if (ret != 0) {
printf("Error while loading %s: %s\n", filename, strerror(-ret)); printf("Error while loading %s: %s\n", exec_path, strerror(-ret));
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }