Use unique_xmalloc_ptr in cd_command

[deliverable/binutils-gdb.git] / gdb / cli / cli-cmds.h

diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index 228e6aaf163c1de32a09982de1c2d05bec5fd9e4..1122a97b3493b42a581ecf0c52987841ebed2c64 100644 (file)
--- a/gdb/cli/cli-cmds.h
+++ b/gdb/cli/cli-cmds.h
@@ -1,9 +1,9 @@
 /* Header file for GDB CLI command implementation library.
-   Copyright (c) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2017 Free Software Foundation, Inc.
 
    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,
@@ -12,13 +12,14 @@
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (CLI_CMDS_H)
 #define CLI_CMDS_H 1
 
+#include "common/filestuff.h"
+#include "common/gdb_optional.h"
+
 /* Chain containing all defined commands.  */
 
 extern struct cmd_list_element *cmdlist;
@@ -27,29 +28,29 @@ extern struct cmd_list_element *cmdlist;
 
 extern struct cmd_list_element *infolist;
 
-/* Chain containing all defined enable subcommands. */
+/* Chain containing all defined enable subcommands.  */
 
 extern struct cmd_list_element *enablelist;
 
-/* Chain containing all defined disable subcommands. */
+/* Chain containing all defined disable subcommands.  */
 
 extern struct cmd_list_element *disablelist;
 
-/* Chain containing all defined delete subcommands. */
+/* Chain containing all defined delete subcommands.  */
 
 extern struct cmd_list_element *deletelist;
 
-/* Chain containing all defined toggle subcommands. */
+/* Chain containing all defined detach subcommands.  */
 
-extern struct cmd_list_element *togglelist;
+extern struct cmd_list_element *detachlist;
 
-/* Chain containing all defined stop subcommands. */
+/* Chain containing all defined kill subcommands.  */
 
-extern struct cmd_list_element *stoplist;
+extern struct cmd_list_element *killlist;
 
-/* Chain containing all defined "enable breakpoint" subcommands. */
+/* Chain containing all defined stop subcommands.  */
 
-extern struct cmd_list_element *enablebreaklist;
+extern struct cmd_list_element *stoplist;
 
 /* Chain containing all defined set subcommands */
 
@@ -75,15 +76,15 @@ extern struct cmd_list_element *showhistlist;
 
 extern struct cmd_list_element *unsethistlist;
 
-/* Chain containing all defined maintenance subcommands. */
+/* Chain containing all defined maintenance subcommands.  */
 
 extern struct cmd_list_element *maintenancelist;
 
-/* Chain containing all defined "maintenance info" subcommands. */
+/* Chain containing all defined "maintenance info" subcommands.  */
 
 extern struct cmd_list_element *maintenanceinfolist;
 
-/* Chain containing all defined "maintenance print" subcommands. */
+/* Chain containing all defined "maintenance print" subcommands.  */
 
 extern struct cmd_list_element *maintenanceprintlist;
 
@@ -115,12 +116,26 @@ extern void cd_command (char *, int);
 
 extern void quit_command (char *, int);
 
-extern void source_script (char *, int);
+extern void source_script (const char *, int);
+
+/* Exported to objfiles.c.  */
+
+/* The script that was opened.  */
+struct open_script
+{
+  gdb_file_up stream;
+  gdb::unique_xmalloc_ptr<char> full_path;
 
-/* Used everywhere whenever at least one parameter is required and
-  none is specified. */
+  open_script (gdb_file_up &&stream_,
+              gdb::unique_xmalloc_ptr<char> &&full_path_)
+    : stream (std::move (stream_)),
+      full_path (std::move (full_path_))
+  {
+  }
+};
 
-extern NORETURN void error_no_arg (char *) ATTR_NORETURN;
+extern gdb::optional<open_script>
+    find_and_open_script (const char *file, int search_path);
 
 /* Command tracing state.  */