This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[obish] FIx mi-cmd-env's -Wformat-nonliteral problems
- From: Andrew Cagney <ac131313 at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Tue, 05 Aug 2003 15:56:54 -0400
- Subject: [obish] FIx mi-cmd-env's -Wformat-nonliteral problems
FYI,
Another case of code assuming a specific format string.
committed,
Andrew
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".
Index: mi/mi-cmd-env.c
===================================================================
RCS file: /cvs/src/src/gdb/mi/mi-cmd-env.c,v
retrieving revision 1.4
diff -u -r1.4 mi-cmd-env.c
--- mi/mi-cmd-env.c 7 Feb 2003 00:27:31 -0000 1.4
+++ mi/mi-cmd-env.c 5 Aug 2003 19:53:34 -0000
@@ -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 @@
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 @@
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 @@
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;
}