aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2003-08-05 19:55:17 +0000
committerAndrew Cagney <cagney@redhat.com>2003-08-05 19:55:17 +0000
commitd303380bd97689a67e841b0f6bc40e6871610393 (patch)
treefef2c7557a1e0c94b575ef5506f371dc3a63be6d
parent9dd5f34f8d4ac79c8e55bb1e5690053cd69e5f51 (diff)
downloadgdb-d303380bd97689a67e841b0f6bc40e6871610393.zip
gdb-d303380bd97689a67e841b0f6bc40e6871610393.tar.gz
gdb-d303380bd97689a67e841b0f6bc40e6871610393.tar.bz2
2003-08-05 Andrew Cagney <cagney@redhat.com>
* mi-cmd-env.c (env_execute_cli_command): Use an explicit "%s %s" when constructing the run command. (mi_cmd_env_cd, mi_cmd_env_path, mi_cmd_env_dir): Simplify command string removing the "%s".
-rw-r--r--gdb/mi/ChangeLog7
-rw-r--r--gdb/mi/mi-cmd-env.c22
2 files changed, 20 insertions, 9 deletions
diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index a9a09d1..512d971 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-05 Andrew Cagney <cagney@redhat.com>
+
+ * mi-cmd-env.c (env_execute_cli_command): Use an explicit "%s %s"
+ when constructing the run command.
+ (mi_cmd_env_cd, mi_cmd_env_path, mi_cmd_env_dir): Simplify command
+ string removing the "%s".
+
2003-08-04 Andrew Cagney <cagney@redhat.com>
* mi-cmds.h (struct mi_cli): Define.
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index 55fcba1..ec0fa35 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -37,23 +37,27 @@
#include "gdb_string.h"
#include "gdb_stat.h"
-static void env_cli_command (const char *cli, char *args);
+static void env_cli_command (const char *cli, const char *args);
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. */
+/* 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 *cli, char *args)
+env_execute_cli_command (const char *cmd, const char *args)
{
- if (cli != 0)
+ if (cmd != 0)
{
struct cleanup *old_cleanups;
char *run;
- xasprintf (&run, cli, args);
+ if (args != NULL)
+ xasprintf (&run, "%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);
@@ -90,7 +94,7 @@ mi_cmd_env_cd (char *command, char **argv, int argc)
if (argc == 0 || argc > 1)
error ("mi_cmd_env_cd: Usage DIRECTORY");
- env_execute_cli_command ("cd %s", argv[0]);
+ env_execute_cli_command ("cd", argv[0]);
return MI_CMD_DONE;
}
@@ -131,7 +135,7 @@ mi_cmd_env_path (char *command, char **argv, int argc)
if (mi_version (uiout) < 2)
{
for (i = argc - 1; i >= 0; --i)
- env_execute_cli_command ("path %s", argv[i]);
+ env_execute_cli_command ("path", argv[i]);
return MI_CMD_DONE;
}
@@ -203,7 +207,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
if (mi_version (uiout) < 2)
{
for (i = argc - 1; i >= 0; --i)
- env_execute_cli_command ("dir %s", argv[i]);
+ env_execute_cli_command ("dir", argv[i]);
return MI_CMD_DONE;
}