* remote.c (remote_cmdlist): New variable.

	(PACKET_vFile_open, PACKET_vFile_pread, PACKET_vFile_pwrite)
	(PACKET_vFile_close, PACKET_vFile_unlink): New constants.
	(remote_buffer_add_string, remote_buffer_add_bytes)
	(remote_buffer_add_int, remote_hostio_parse_result)
	(remote_hostio_send_command, remote_hostio_open, remote_hostio_pwrite)
	(remote_hostio_pread, remote_hostio_close, remote_hostio_unlink)
	(remote_fileio_errno_to_host, remote_hostio_error, fclose_cleanup)
	(remote_hostio_close_cleanup, remote_file_put, remote_file_get)
	(remote_file_delete, remote_put_command, remote_get_command)
	(remote_delete_command, remote_command): New functions.
	(_initialize_remote): Register new packets and commands.
	* Makefile.in (gdb_fileio_h): New variable.
	(remote.o): Update.
	(SUBDIR_MI_OBS): Add mi-cmd-target.o.
	(SUBDIR_MI_SRCS): Add mi/mi-cmd-target.c.
	(mi-cmd-target.o): New rule.
	* mi/mi-cmd-target.c: New file.
	* mi/mi-cmds.c (mi_cmds): Add target-file-delete, target-file-get,
	and target-file-put.
	* mi/mi-cmds.h (mi_cmd_target_file_get, mi_cmd_target_file_put)
	(mi_cmd_target_file_delete): Declare.
	* remote.h (remote_file_put, remote_file_get, remote_file_delete):
	Declare.
	* NEWS: Describe new file transfer support.

	* gdb.texinfo (Debugging Programs with Multiple Processes): Correct
	formatting.
	(Remote Debugging): Add File Transfer section.
	(Remote Configuration): Document Host I/O packets.
	(GDB/MI): Add GDB/MI File Transfer Commands section.
	(Remote Protocol): Add Host I/O Packets section.
	(Packets): Add vFile.

	* Makefile.in (OBS): Add hostio.o.
	(hostio.o): New rule.
	* server.h (handle_vFile): Declare.
	* hostio.c: New file.
	* server.c (handle_v_requests): Take packet_len and new_packet_len
	for binary packets.  Call handle_vFile.
	(main): Update call to handle_v_requests.

	* gdb.server/file-transfer.exp, gdb.server/transfer.txt,
	gdb.mi/mi-file-transfer.exp: New.

3 files changed, 106 insertions, 0 deletions

diff --git a/gdb/mi/mi-cmd-target.c b/gdb/mi/mi-cmd-target.c
new file mode 100644
index 00000000000..4d33bba4ac4
--- /dev/null
+++ b/gdb/mi/mi-cmd-target.c
@@ -0,0 +1,100 @@
+/* MI Command Set - target commands.
+   Copyright (C) 2007 Free Software Foundation, 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.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, see <http://www.gnu.org/licenses/>.  */
+
+#include "defs.h"
+#include "mi-cmds.h"
+#include "mi-getopt.h"
+#include "remote.h"
+
+/* Get a file from the target.  */
+
+enum mi_cmd_result
+mi_cmd_target_file_get (char *command, char **argv, int argc)
+{
+  int optind = 0;
+  char *optarg;
+  const char *remote_file, *local_file;
+  static struct mi_opt opts[] =
+  {
+    { 0, 0, 0 }
+  };
+  static const char *prefix = "mi_cmd_target_file_get";
+
+  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
+      || optind != argc - 2)
+    error (_("mi_cmd_target_file_get: Usage: REMOTE_FILE LOCAL_FILE"));
+
+  remote_file = argv[optind];
+  local_file = argv[optind + 1];
+
+  remote_file_get (remote_file, local_file, 0);
+
+  return MI_CMD_DONE;
+}
+
+/* Send a file to the target.  */
+
+enum mi_cmd_result
+mi_cmd_target_file_put (char *command, char **argv, int argc)
+{
+  int optind = 0;
+  char *optarg;
+  const char *remote_file, *local_file;
+  static struct mi_opt opts[] =
+  {
+    { 0, 0, 0 }
+  };
+  static const char *prefix = "mi_cmd_target_file_put";
+
+  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
+      || optind != argc - 2)
+    error (_("mi_cmd_target_file_put: Usage: LOCAL_FILE REMOTE_FILE"));
+
+  local_file = argv[optind];
+  remote_file = argv[optind + 1];
+
+  remote_file_put (local_file, remote_file, 0);
+
+  return MI_CMD_DONE;
+}
+
+/* Delete a file on the target.  */
+
+enum mi_cmd_result
+mi_cmd_target_file_delete (char *command, char **argv, int argc)
+{
+  int optind = 0;
+  char *optarg;
+  const char *remote_file, *local_file;
+  static struct mi_opt opts[] =
+  {
+    { 0, 0, 0 }
+  };
+  static const char *prefix = "mi_cmd_target_file_delete";
+
+  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
+      || optind != argc - 1)
+    error (_("mi_cmd_target_file_delete: Usage: REMOTE_FILE"));
+
+  remote_file = argv[optind];
+
+  remote_file_delete (remote_file, 0);
+
+  return MI_CMD_DONE;
+}
+
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index 5bd8725e9c2..4082d89bb92 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -123,6 +123,9 @@ struct mi_cmd mi_cmds[] =
   { "target-disconnect", { "disconnect", 0 }, 0 },
   { "target-download", { NULL, 0 }, mi_cmd_target_download},
   { "target-exec-status", { NULL, 0 }, NULL, NULL },
+  { "target-file-delete", { NULL, 0 }, NULL, mi_cmd_target_file_delete },
+  { "target-file-get", { NULL, 0 }, NULL, mi_cmd_target_file_get },
+  { "target-file-put", { NULL, 0 }, NULL, mi_cmd_target_file_put },
   { "target-list-available-targets", { NULL, 0 }, NULL, NULL },
   { "target-list-current-targets", { NULL, 0 }, NULL, NULL },
   { "target-list-parameters", { NULL, 0 }, NULL, NULL },
diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h
index 9888c85fb82..9ea08e8f57d 100644
--- a/gdb/mi/mi-cmds.h
+++ b/gdb/mi/mi-cmds.h
@@ -100,6 +100,9 @@ extern mi_cmd_argv_ftype mi_cmd_stack_list_locals;
 extern mi_cmd_argv_ftype mi_cmd_stack_select_frame;
 extern mi_cmd_argv_ftype mi_cmd_symbol_list_lines;
 extern mi_cmd_args_ftype mi_cmd_target_download;
+extern mi_cmd_argv_ftype mi_cmd_target_file_get;
+extern mi_cmd_argv_ftype mi_cmd_target_file_put;
+extern mi_cmd_argv_ftype mi_cmd_target_file_delete;
 extern mi_cmd_args_ftype mi_cmd_target_select;
 extern mi_cmd_argv_ftype mi_cmd_thread_list_ids;
 extern mi_cmd_argv_ftype mi_cmd_thread_select;