public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] bsd-kvm: Fix build after recent changes to path handling functions.
@ 2022-04-26 16:14 John Baldwin
0 siblings, 0 replies; only message in thread
From: John Baldwin @ 2022-04-26 16:14 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c62dced2d48a8a3a818c87d0d9d41709fe7997d9
commit c62dced2d48a8a3a818c87d0d9d41709fe7997d9
Author: John Baldwin <jhb@FreeBSD.org>
Date: Tue Apr 26 09:13:12 2022 -0700
bsd-kvm: Fix build after recent changes to path handling functions.
Convert bsd_kvm_corefile and the local filename in bsd_kvm_open to
std::string rather than simple char * pointers freed by xfree.
Diff:
---
gdb/bsd-kvm.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 45c7f116472..e9e41df1bec 100644
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -21,6 +21,7 @@
#include "defs.h"
#include "cli/cli-cmds.h"
#include "command.h"
+#include "filenames.h"
#include "frame.h"
#include "regcache.h"
#include "target.h"
@@ -30,6 +31,7 @@
#include "inferior.h" /* for get_exec_file */
#include "gdbthread.h"
#include "gdbsupport/pathstuff.h"
+#include "gdbsupport/gdb_tilde_expand.h"
#include <fcntl.h>
#include <kvm.h>
@@ -47,7 +49,7 @@
#include "bsd-kvm.h"
/* Kernel memory device file. */
-static const char *bsd_kvm_corefile;
+static std::string bsd_kvm_corefile;
/* Kernel memory interface descriptor. */
static kvm_t *core_kd;
@@ -109,24 +111,19 @@ bsd_kvm_target_open (const char *arg, int from_tty)
char errbuf[_POSIX2_LINE_MAX];
const char *execfile = NULL;
kvm_t *temp_kd;
- char *filename = NULL;
+ std::string filename;
target_preopen (from_tty);
if (arg)
{
- filename = tilde_expand (arg);
- if (filename[0] != '/')
- {
- gdb::unique_xmalloc_ptr<char> temp (gdb_abspath (filename));
-
- xfree (filename);
- filename = temp.release ();
- }
+ filename = gdb_tilde_expand (arg);
+ if (!IS_ABSOLUTE_PATH (filename))
+ filename = gdb_abspath (filename.c_str ());
}
execfile = get_exec_file (0);
- temp_kd = kvm_openfiles (execfile, filename, NULL,
+ temp_kd = kvm_openfiles (execfile, filename.c_str (), NULL,
write_files ? O_RDWR : O_RDONLY, errbuf);
if (temp_kd == NULL)
error (("%s"), errbuf);
@@ -155,6 +152,7 @@ bsd_kvm_target::close ()
core_kd = NULL;
}
+ bsd_kvm_corefile.clear ();
switch_to_no_thread ();
exit_inferior_silent (current_inferior ());
}
@@ -203,9 +201,9 @@ bsd_kvm_target::xfer_partial (enum target_object object,
void
bsd_kvm_target::files_info ()
{
- if (bsd_kvm_corefile && strcmp (bsd_kvm_corefile, _PATH_MEM) != 0)
+ if (bsd_kvm_corefile != _PATH_MEM)
gdb_printf (_("\tUsing the kernel crash dump %s.\n"),
- bsd_kvm_corefile);
+ bsd_kvm_corefile.c_str ());
else
gdb_printf (_("\tUsing the currently running kernel.\n"));
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-26 16:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-26 16:14 [binutils-gdb] bsd-kvm: Fix build after recent changes to path handling functions John Baldwin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).