Rename 'argv0' and 'argv1' to the more meaningful 'interp_name' and

'interp_args'.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2530

diff --git a/coregrind/ume.c b/coregrind/ume.c
index 305c9464a717ff106e80fcd0e419bd6f53584503..c0bdb0a8b10461954848ba17d2408401ee0114fd 100644 (file)
--- a/coregrind/ume.c
+++ b/coregrind/ume.c
@@ -565,19 +565,19 @@ static int load_script(char *hdr, int len, int fd, const char *name, struct exei
       *cp = '\0';
    }
    
-   info->argv0 = strdup(interp);
-   assert(NULL != info->argv0);
+   info->interp_name = strdup(interp);
+   assert(NULL != info->interp_name);
    if (arg != NULL && *arg != '\0') {
-      info->argv1 = strdup(arg);
-      assert(NULL != info->argv1);
+      info->interp_args = strdup(arg);
+      assert(NULL != info->interp_args);
    }
 
    if (info->argv && info->argv[0] != NULL)
       info->argv[0] = (char *)name;
 
    if (0)
-      printf("#! script: argv0=\"%s\" argv1=\"%s\"\n",
-            info->argv0, info->argv1);
+      printf("#! script: interp_name=\"%s\" interp_args=\"%s\"\n",
+            info->interp_name, info->interp_args);
 
    return do_exec_inner(interp, info);
 }
@@ -669,8 +669,8 @@ static int do_exec_inner(const char *exe, struct exeinfo *info)
 
 int do_exec(const char *exe, struct exeinfo *info)
 {
-   info->argv0 = NULL;
-   info->argv1 = NULL;
+   info->interp_name = NULL;
+   info->interp_args = NULL;
 
    return do_exec_inner(exe, info);
 }

diff --git a/coregrind/ume.h b/coregrind/ume.h
index 118119e79d15bfc7a61d9165172851fd83166068..70008e1815f459c579be4d71639d1e629e6cf76d 100644 (file)
--- a/coregrind/ume.h
+++ b/coregrind/ume.h
@@ -70,8 +70,8 @@ struct exeinfo
    addr_t brkbase;      // base address of brk segment
 
    // These are the extra args added by #! scripts
-   char*  argv0;        // INPUT: the interpreter name
-   char*  argv1;        // INPUT: the args for the interpreter
+   char*  interp_name;  // INPUT: the interpreter name
+   char*  interp_args;  // INPUT: the args for the interpreter
 };
 
 int do_exec(const char *exe, struct exeinfo *info);

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 3393ff370b41cd1a008678fc6bc6e81e3e75a6c0..f3470c5516cad2ef0934720a4300657030db458e 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1013,13 +1013,13 @@ static Addr setup_client_stack(char **orig_argv, char **orig_envp,
    /* paste on the extra args if the loader needs them (ie, the #! 
       interpreter and its argument) */
    argc = 0;
-   if (info->argv0 != NULL) {
+   if (info->interp_name != NULL) {
       argc++;
-      stringsize += strlen(info->argv0) + 1;
+      stringsize += strlen(info->interp_name) + 1;
    }
-   if (info->argv1 != NULL) {
+   if (info->interp_args != NULL) {
       argc++;
-      stringsize += strlen(info->argv1) + 1;
+      stringsize += strlen(info->interp_args) + 1;
    }
 
    /* now scan the args we're given... */
@@ -1091,13 +1091,13 @@ static Addr setup_client_stack(char **orig_argv, char **orig_envp,
    *ptr++ = argc;              /* client argc */
 
    /* --- argv --- */
-   if (info->argv0) {
-      *ptr++ = (addr_t)copy_str(&strtab, info->argv0);
-      free(info->argv0);
+   if (info->interp_name) {
+      *ptr++ = (addr_t)copy_str(&strtab, info->interp_name);
+      free(info->interp_name);
    }
-   if (info->argv1) {
-      *ptr++ = (addr_t)copy_str(&strtab, info->argv1);
-      free(info->argv1);
+   if (info->interp_args) {
+      *ptr++ = (addr_t)copy_str(&strtab, info->interp_args);
+      free(info->interp_args);
    }
    for (cpp = orig_argv; *cpp; ptr++, cpp++) {
       *ptr = (addr_t)copy_str(&strtab, *cpp);
@@ -1452,8 +1452,8 @@ static void load_client(char* cl_argv[], const char* exec, Int need_help,
 
    if (need_help) {
       VG_(clexecfd) = -1;
-      info->argv0 = NULL;
-      info->argv1 = NULL;
+      info->interp_name = NULL;
+      info->interp_args = NULL;
    } else {
       Int ret;
       VG_(clexecfd) = VG_(open)(exec, O_RDONLY, VKI_S_IRUSR);