From 2331309d2f8d30ab059f3f873bb78af78fedde12 Mon Sep 17 00:00:00 2001 From: "Balazs Gerofi bgerofi@riken.jp" Date: Tue, 27 May 2014 17:52:56 +0900 Subject: [PATCH] mcexec: use optind instead of shifting argv[] for arguments passing to remote app --- executer/user/mcexec.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c index 6b37dd0e..3e1a05d8 100644 --- a/executer/user/mcexec.c +++ b/executer/user/mcexec.c @@ -772,21 +772,14 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - /* Shift arguments to the front */ - for (a = argv + optind; *a; a++) { - a[- optind + 1] = a[0]; - } - argv[argc - optind + 2] = NULL; - argc -= (optind); - __dprintf("target_core: %d, device: %s, command: ", target_core, dev); - for (i = 1; i < argc; ++i) { + for (i = optind; i < argc; ++i) { __dprintf("%s ", argv[i]); } __dprintf("\n"); - if (load_elf_desc(argv[1], &desc) != 0) { - fprintf(stderr, "error: loading file: %s\n", argv[1]); + if (load_elf_desc(argv[optind], &desc) != 0) { + fprintf(stderr, "error: loading file: %s\n", argv[optind]); return 1; } @@ -794,7 +787,7 @@ int main(int argc, char **argv) desc->envs = envs; //print_flat(envs); - desc->args_len = flatten_strings(-1, argv + 1, &args); + desc->args_len = flatten_strings(-1, argv + optind, &args); desc->args = args; //print_flat(args);