Merge GDB 7.5.1

gdb/mi/mi-cmd-env.c

 /* MI Command Set - environment commands.
-
    Copyright (C) 2002-2004, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by Red Hat Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 16 matching lines @@
 #include "target.h"
 #include "environ.h"
 #include "command.h"
 #include "ui-out.h"
 #include "top.h"
 
 #include "gdb_string.h"
 #include "gdb_stat.h"
 
 static void env_mod_path (char *dirname, char **which_path);
+
 extern void _initialize_mi_cmd_env (void);
 
 static const char path_var_name[] = "PATH";
 static char *orig_path = NULL;
 
 /* The following is copied from mi-main.c so for m1 and below we can
    perform old behavior and use cli commands.  If ARGS is non-null,
    append it to the CMD.  */
+
 static void
 env_execute_cli_command (const char *cmd, const char *args)
 {
   if (cmd != 0)
     {
       struct cleanup *old_cleanups;
       char *run;
 
       if (args != NULL)
         run = xstrprintf ("%s %s", cmd, args);
       else
         run = xstrdup (cmd);
       old_cleanups = make_cleanup (xfree, run);
       execute_command ( /*ui */ run, 0 /*from_tty */ );
       do_cleanups (old_cleanups);
       return;
     }
 }
 
+/* Print working directory.  */
 
-/* Print working directory.  */
 void
 mi_cmd_env_pwd (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
 
   if (argc > 0)
-    error (_("-environment-pwd: No arguments required"));
+    error (_("-environment-pwd: No arguments allowed"));
           
   if (mi_version (uiout) < 2)
     {
       env_execute_cli_command ("pwd", NULL);
       return;
     }
      
   /* Otherwise the mi level is 2 or higher.  */
 
   if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
     error (_("-environment-pwd: error finding name of working directory: %s"),
            safe_strerror (errno));
     
   ui_out_field_string (uiout, "cwd", gdb_dirbuf);
 }
 
 /* Change working directory.  */
+
 void
 mi_cmd_env_cd (char *command, char **argv, int argc)
 {
   if (argc == 0 || argc > 1)
     error (_("-environment-cd: Usage DIRECTORY"));
           
   env_execute_cli_command ("cd", argv[0]);
 }
 
 static void
 env_mod_path (char *dirname, char **which_path)
 {
   if (dirname == 0 || dirname[0] == '\0')
     return;
 
   /* Call add_path with last arg 0 to indicate not to parse for 
      separator characters.  */
   add_path (dirname, which_path, 0);
 }
 
 /* Add one or more directories to start of executable search path.  */
+
 void
 mi_cmd_env_path (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   char *exec_path;
   char *env;
   int reset = 0;
-  int optind = 0;
+  int oind = 0;
   int i;
-  char *optarg;
+  char *oarg;
   enum opt
     {
       RESET_OPT
     };
   static const struct mi_opt opts[] =
   {
     {"r", RESET_OPT, 0},
     { 0, 0, 0 }
   };
 
   dont_repeat ();
 
   if (mi_version (uiout) < 2)
     {
       for (i = argc - 1; i >= 0; --i)
         env_execute_cli_command ("path", argv[i]);
       return;
     }
 
   /* Otherwise the mi level is 2 or higher.  */
   while (1)
     {
       int opt = mi_getopt ("-environment-path", argc, argv, opts,
-                           &optind, &optarg);
+                           &oind, &oarg);
 
       if (opt < 0)
         break;
       switch ((enum opt) opt)
         {
         case RESET_OPT:
           reset = 1;
           break;
         }
     }
-  argv += optind;
-  argc -= optind;
+  argv += oind;
+  argc -= oind;
 
 
   if (reset)
     {
       /* Reset implies resetting to original path first.  */
       exec_path = xstrdup (orig_path);
     }
   else
     {
       /* Otherwise, get current path to modify.  */
       env = get_in_environ (current_inferior ()->environment, path_var_name);
 
       /* Can be null if path is not set.  */
       if (!env)
         env = "";
       exec_path = xstrdup (env);
     }
 
   for (i = argc - 1; i >= 0; --i)
     env_mod_path (argv[i], &exec_path);
 
   set_in_environ (current_inferior ()->environment, path_var_name, exec_path);
   xfree (exec_path);
   env = get_in_environ (current_inferior ()->environment, path_var_name);
   ui_out_field_string (uiout, "path", env);
 }
 
 /* Add zero or more directories to the front of the source path.  */
+
 void
 mi_cmd_env_dir (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   int i;
-  int optind = 0;
+  int oind = 0;
   int reset = 0;
-  char *optarg;
+  char *oarg;
   enum opt
     {
       RESET_OPT
     };
   static const struct mi_opt opts[] =
   {
     {"r", RESET_OPT, 0},
     { 0, 0, 0 }
   };
 
   dont_repeat ();
 
   if (mi_version (uiout) < 2)
     {
       for (i = argc - 1; i >= 0; --i)
         env_execute_cli_command ("dir", argv[i]);
       return;
     }
 
   /* Otherwise mi level is 2 or higher.  */
   while (1)
     {
       int opt = mi_getopt ("-environment-directory", argc, argv, opts,
-                           &optind, &optarg);
+                           &oind, &oarg);
 
       if (opt < 0)
         break;
       switch ((enum opt) opt)
         {
         case RESET_OPT:
           reset = 1;
           break;
         }
     }
-  argv += optind;
-  argc -= optind;
+  argv += oind;
+  argc -= oind;
 
   if (reset)
     {
       /* Reset means setting to default path first.  */
       xfree (source_path);
       init_source_path ();
     }
 
   for (i = argc - 1; i >= 0; --i)
     env_mod_path (argv[i], &source_path);
 
   ui_out_field_string (uiout, "source-path", source_path);
   forget_cached_source_info ();
 }
 
 /* Set the inferior terminal device name.  */
+
 void
 mi_cmd_inferior_tty_set (char *command, char **argv, int argc)
 {
   set_inferior_io_terminal (argv[0]);
 }
 
-/* Print the inferior terminal device name  */
+/* Print the inferior terminal device name.  */
+
 void
 mi_cmd_inferior_tty_show (char *command, char **argv, int argc)
 {
   const char *inferior_io_terminal = get_inferior_io_terminal ();
   
   if ( !mi_valid_noargs ("-inferior-tty-show", argc, argv))
     error (_("-inferior-tty-show: Usage: No args"));
 
   if (inferior_io_terminal)
     ui_out_field_string (current_uiout,
                          "inferior_tty_terminal", inferior_io_terminal);
 }
 
 void 
 _initialize_mi_cmd_env (void)
 {
   struct gdb_environ *environment;
   char *env;
 
   /* We want original execution path to reset to, if desired later.
      At this point, current inferior is not created, so cannot use
      current_inferior ()->environment.  Also, there's no obvious
-     place where this code can be moved suchs that it surely run
+     place where this code can be moved such that it surely run
      before any code possibly mangles original PATH.  */
   environment = make_environ ();
   init_environ (environment);
   env = get_in_environ (environment, path_var_name);
 
   /* Can be null if path is not set.  */
   if (!env)
     env = "";
   orig_path = xstrdup (env);
   free_environ (environment);
 }