Merge GDB 7.5.1

gdb/mi/mi-cmd-env.c

Index: gdb/mi/mi-cmd-env.c
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index 65307a69ed2398c3daa9c028ed17e2f98d4a35ef..ebf4974dd1657da716cf0079bb6e1fe906335210 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -1,5 +1,4 @@
 /* MI Command Set - environment commands.
-
    Copyright (C) 2002-2004, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by Red Hat Inc.
@@ -36,6 +35,7 @@
 #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";
@@ -44,6 +44,7 @@ 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)
 {
@@ -63,15 +64,15 @@ env_execute_cli_command (const char *cmd, const char *args)
     }
 }
 
-
 /* 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)
     {
@@ -89,6 +90,7 @@ mi_cmd_env_pwd (char *command, char **argv, int argc)
 }
 
 /* Change working directory.  */
+
 void
 mi_cmd_env_cd (char *command, char **argv, int argc)
 {
@@ -110,6 +112,7 @@ env_mod_path (char *dirname, char **which_path)
 }
 
 /* Add one or more directories to start of executable search path.  */
+
 void
 mi_cmd_env_path (char *command, char **argv, int argc)
 {
@@ -117,9 +120,9 @@ mi_cmd_env_path (char *command, char **argv, int argc)
   char *exec_path;
   char *env;
   int reset = 0;
-  int optind = 0;
+  int oind = 0;
   int i;
-  char *optarg;
+  char *oarg;
   enum opt
     {
       RESET_OPT
@@ -143,7 +146,7 @@ mi_cmd_env_path (char *command, char **argv, int argc)
   while (1)
     {
       int opt = mi_getopt ("-environment-path", argc, argv, opts,
-                           &optind, &optarg);
+                           &oind, &oarg);
 
       if (opt < 0)
         break;
@@ -154,8 +157,8 @@ mi_cmd_env_path (char *command, char **argv, int argc)
           break;
         }
     }
-  argv += optind;
-  argc -= optind;
+  argv += oind;
+  argc -= oind;
 
 
   if (reset)
@@ -184,14 +187,15 @@ mi_cmd_env_path (char *command, char **argv, int argc)
 }
 
 /* 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
@@ -215,7 +219,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
   while (1)
     {
       int opt = mi_getopt ("-environment-directory", argc, argv, opts,
-                           &optind, &optarg);
+                           &oind, &oarg);
 
       if (opt < 0)
         break;
@@ -226,8 +230,8 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
           break;
         }
     }
-  argv += optind;
-  argc -= optind;
+  argv += oind;
+  argc -= oind;
 
   if (reset)
     {
@@ -244,13 +248,15 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
 }
 
 /* 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)
 {
@@ -273,7 +279,7 @@ _initialize_mi_cmd_env (void)
   /* 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);