Fix pthread_setname_np build error

[deliverable/binutils-gdb.git] / gdb / mi / mi-cmd-env.c

diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index 61fa7f8b098bb18052f61bebc4c05f721459a503..ee01afa4c9c23929b5e36f0d9129df3ada73a651 100644 (file)
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -1,6 +1,5 @@
 /* MI Command Set - environment commands.
 /* MI Command Set - environment commands.

-
-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002-2019 Free Software Foundation, Inc.

 
    Contributed by Red Hat Inc.
 
 
    Contributed by Red Hat Inc.
 


@@ -8,7 +7,7 @@
 
    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
 
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "inferior.h"
 
 #include "defs.h"
 #include "inferior.h"


@@ -29,16 +26,12 @@
 #include "mi-getopt.h"
 #include "symtab.h"
 #include "target.h"
 #include "mi-getopt.h"
 #include "symtab.h"
 #include "target.h"

-#include "environ.h"
+#include "gdbsupport/environ.h"

 #include "command.h"
 #include "ui-out.h"
 #include "top.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);
+#include <sys/stat.h>
+#include "source.h"

 
 static const char path_var_name[] = "PATH";
 static char *orig_path = NULL;
 
 static const char path_var_name[] = "PATH";
 static char *orig_path = NULL;


@@ -46,60 +39,61 @@ 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.  */
 /* 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)
     {
 static void
 env_execute_cli_command (const char *cmd, const char *args)
 {
   if (cmd != 0)
     {

-      struct cleanup *old_cleanups;
-      char *run;
+      gdb::unique_xmalloc_ptr<char> run;
+

       if (args != NULL)
       if (args != NULL)

-       run = xstrprintf ("%s %s", cmd, args);
+       run.reset (xstrprintf ("%s %s", cmd, args));

       else
       else

-       run = xstrdup (cmd);
-      old_cleanups = make_cleanup (xfree, run);
-      execute_command ( /*ui */ run, 0 /*from_tty */ );
-      do_cleanups (old_cleanups);
-      return;
+       run.reset (xstrdup (cmd));
+      execute_command ( /*ui */ run.get (), 0 /*from_tty */ );

     }
 }
 
     }
 }
 

-

 /* Print working directory.  */
 /* Print working directory.  */

-enum mi_cmd_result
-mi_cmd_env_pwd (char *command, char **argv, int argc)
+
+void
+mi_cmd_env_pwd (const char *command, char **argv, int argc)

 {
 {

+  struct ui_out *uiout = current_uiout;
+

   if (argc > 0)
   if (argc > 0)

-    error (_("mi_cmd_env_pwd: No arguments required"));
+    error (_("-environment-pwd: No arguments allowed"));

           
   if (mi_version (uiout) < 2)
     {
       env_execute_cli_command ("pwd", NULL);
           
   if (mi_version (uiout) < 2)
     {
       env_execute_cli_command ("pwd", NULL);

-      return MI_CMD_DONE;
+      return;

     }
      
   /* Otherwise the mi level is 2 or higher.  */
 
     }
      
   /* Otherwise the mi level is 2 or higher.  */
 

-  getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
-  ui_out_field_string (uiout, "cwd", gdb_dirbuf);
+  gdb::unique_xmalloc_ptr<char> cwd (getcwd (NULL, 0));
+  if (cwd == NULL)
+    error (_("-environment-pwd: error finding name of working directory: %s"),
+           safe_strerror (errno));

 
 

-  return MI_CMD_DONE;
+  uiout->field_string ("cwd", cwd.get ());

 }
 
 /* Change working directory.  */
 }
 
 /* Change working directory.  */

-enum mi_cmd_result
-mi_cmd_env_cd (char *command, char **argv, int argc)
+
+void
+mi_cmd_env_cd (const char *command, char **argv, int argc)

 {
   if (argc == 0 || argc > 1)
 {
   if (argc == 0 || argc > 1)

-    error (_("mi_cmd_env_cd: Usage DIRECTORY"));
+    error (_("-environment-cd: Usage DIRECTORY"));

           
   env_execute_cli_command ("cd", argv[0]);
           
   env_execute_cli_command ("cd", argv[0]);

-
-  return MI_CMD_DONE;

 }
 
 static void
 }
 
 static void

-env_mod_path (char *dirname, char **which_path)
+env_mod_path (const char *dirname, char **which_path)

 {
   if (dirname == 0 || dirname[0] == '\0')
     return;
 {
   if (dirname == 0 || dirname[0] == '\0')
     return;


@@ -110,23 +104,25 @@ env_mod_path (char *dirname, char **which_path)
 }
 
 /* Add one or more directories to start of executable search path.  */
 }
 
 /* Add one or more directories to start of executable search path.  */

-enum mi_cmd_result
-mi_cmd_env_path (char *command, char **argv, int argc)
+
+void
+mi_cmd_env_path (const char *command, char **argv, int argc)

 {
 {

+  struct ui_out *uiout = current_uiout;

   char *exec_path;
   char *exec_path;

-  char *env;
+  const char *env;

   int reset = 0;
   int reset = 0;

-  int optind = 0;
+  int oind = 0;

   int i;
   int i;

-  char *optarg;
+  char *oarg;

   enum opt
     {
       RESET_OPT
     };
   enum opt
     {
       RESET_OPT
     };

-  static struct mi_opt opts[] =
+  static const struct mi_opt opts[] =

   {
     {"r", RESET_OPT, 0},
   {
     {"r", RESET_OPT, 0},

-    0
+    { 0, 0, 0 }

   };
 
   dont_repeat ();
   };
 
   dont_repeat ();


@@ -135,14 +131,15 @@ mi_cmd_env_path (char *command, char **argv, int argc)
     {
       for (i = argc - 1; i >= 0; --i)
        env_execute_cli_command ("path", argv[i]);
     {
       for (i = argc - 1; i >= 0; --i)
        env_execute_cli_command ("path", argv[i]);

-      return MI_CMD_DONE;
+      return;

     }
 
   /* Otherwise the mi level is 2 or higher.  */
   while (1)
     {
     }
 
   /* Otherwise the mi level is 2 or higher.  */
   while (1)
     {

-      int opt = mi_getopt ("mi_cmd_env_path", argc, argv, opts,
-                           &optind, &optarg);
+      int opt = mi_getopt ("-environment-path", argc, argv, opts,
+                           &oind, &oarg);
+

       if (opt < 0)
         break;
       switch ((enum opt) opt)
       if (opt < 0)
         break;
       switch ((enum opt) opt)


@@ -152,8 +149,8 @@ mi_cmd_env_path (char *command, char **argv, int argc)
           break;
         }
     }
           break;
         }
     }

-  argv += optind;
-  argc -= optind;
+  argv += oind;
+  argc -= oind;

 
 
   if (reset)
 
 
   if (reset)


@@ -164,7 +161,7 @@ mi_cmd_env_path (char *command, char **argv, int argc)
   else
     {
       /* Otherwise, get current path to modify.  */
   else
     {
       /* Otherwise, get current path to modify.  */

-      env = get_in_environ (inferior_environ, path_var_name);
+      env = current_inferior ()->environment.get (path_var_name);

 
       /* Can be null if path is not set.  */
       if (!env)
 
       /* Can be null if path is not set.  */
       if (!env)


@@ -175,30 +172,30 @@ mi_cmd_env_path (char *command, char **argv, int argc)
   for (i = argc - 1; i >= 0; --i)
     env_mod_path (argv[i], &exec_path);
 
   for (i = argc - 1; i >= 0; --i)
     env_mod_path (argv[i], &exec_path);
 

-  set_in_environ (inferior_environ, path_var_name, exec_path);
+  current_inferior ()->environment.set (path_var_name, exec_path);

   xfree (exec_path);
   xfree (exec_path);

-  env = get_in_environ (inferior_environ, path_var_name);
-  ui_out_field_string (uiout, "path", env);
-
-  return MI_CMD_DONE;
+  env = current_inferior ()->environment.get (path_var_name);
+  uiout->field_string ("path", env);

 }
 
 /* Add zero or more directories to the front of the source path.  */
 }
 
 /* Add zero or more directories to the front of the source path.  */

-enum mi_cmd_result
-mi_cmd_env_dir (char *command, char **argv, int argc)
+
+void
+mi_cmd_env_dir (const char *command, char **argv, int argc)

 {
 {

+  struct ui_out *uiout = current_uiout;

   int i;
   int i;

-  int optind = 0;
+  int oind = 0;

   int reset = 0;
   int reset = 0;

-  char *optarg;
+  char *oarg;

   enum opt
     {
       RESET_OPT
     };
   enum opt
     {
       RESET_OPT
     };

-  static struct mi_opt opts[] =
+  static const struct mi_opt opts[] =

   {
     {"r", RESET_OPT, 0},
   {
     {"r", RESET_OPT, 0},

-    0
+    { 0, 0, 0 }

   };
 
   dont_repeat ();
   };
 
   dont_repeat ();


@@ -207,14 +204,15 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
     {
       for (i = argc - 1; i >= 0; --i)
        env_execute_cli_command ("dir", argv[i]);
     {
       for (i = argc - 1; i >= 0; --i)
        env_execute_cli_command ("dir", argv[i]);

-      return MI_CMD_DONE;
+      return;

     }
 
   /* Otherwise mi level is 2 or higher.  */
   while (1)
     {
     }
 
   /* Otherwise mi level is 2 or higher.  */
   while (1)
     {

-      int opt = mi_getopt ("mi_cmd_env_dir", argc, argv, opts,
-                           &optind, &optarg);
+      int opt = mi_getopt ("-environment-directory", argc, argv, opts,
+                           &oind, &oarg);
+

       if (opt < 0)
         break;
       switch ((enum opt) opt)
       if (opt < 0)
         break;
       switch ((enum opt) opt)


@@ -224,8 +222,8 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
           break;
         }
     }
           break;
         }
     }

-  argv += optind;
-  argc -= optind;
+  argv += oind;
+  argc -= oind;

 
   if (reset)
     {
 
   if (reset)
     {


@@ -236,21 +234,44 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
 
   for (i = argc - 1; i >= 0; --i)
     env_mod_path (argv[i], &source_path);
 
   for (i = argc - 1; i >= 0; --i)
     env_mod_path (argv[i], &source_path);

-  init_last_source_visited ();

 
 

-  ui_out_field_string (uiout, "source-path", source_path);
+  uiout->field_string ("source-path", source_path);

   forget_cached_source_info ();
   forget_cached_source_info ();

+}
+
+/* Set the inferior terminal device name.  */

 
 

-  return MI_CMD_DONE;
+void
+mi_cmd_inferior_tty_set (const char *command, char **argv, int argc)
+{
+  set_inferior_io_terminal (argv[0]);
+}
+
+/* Print the inferior terminal device name.  */
+
+void
+mi_cmd_inferior_tty_show (const 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)
+    current_uiout->field_string ("inferior_tty_terminal", inferior_io_terminal);

 }
 
 void 
 _initialize_mi_cmd_env (void)
 {
 }
 
 void 
 _initialize_mi_cmd_env (void)
 {

-  char *env;
-
-  /* We want original execution path to reset to, if desired later.  */
-  env = get_in_environ (inferior_environ, path_var_name);
+  const 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.  We use getenv here because it
+     is not necessary to create a whole new gdb_environ just for one
+     variable.  */
+  env = getenv (path_var_name);

 
   /* Can be null if path is not set.  */
   if (!env)
 
   /* Can be null if path is not set.  */
   if (!env)