Commit 9d3019bc authored by Laurent Vivier's avatar Laurent Vivier
Browse files

linux-user: remove useless variable 



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: d088d664 ("linux-user: identify running binary in /proc/self/exe")
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Message-Id: <20190714134028.315-1-laurent@vivier.eu>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 89ea03a7

linux-user/main.c

+4 −6
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
char *exec_path;



int singlestep;

static const char *filename;

static const char *argv0;

static int gdbstub_port;

static envlist_t *envlist;
@@ -586,7 +585,6 @@ static int parse_args(int argc, char **argv) 
        exit(EXIT_FAILURE);

    }



    filename = argv[optind];

    exec_path = argv[optind];



    return optind;
@@ -657,9 +655,9 @@ int main(int argc, char **argv, char **envp) 


    execfd = qemu_getauxval(AT_EXECFD);

    if (execfd == 0) {

        execfd = open(filename, O_RDONLY);

        execfd = open(exec_path, O_RDONLY);

        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);

        }

    }
@@ -784,10 +782,10 @@ int main(int argc, char **argv, char **envp) 
    cpu->opaque = 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);

    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);

    }