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.
This commit is contained in:
parent
6bdd7cf11d
commit
c62dced2d4
1 changed files with 11 additions and 13 deletions
|
@ -21,6 +21,7 @@
|
||||||
#include "defs.h"
|
#include "defs.h"
|
||||||
#include "cli/cli-cmds.h"
|
#include "cli/cli-cmds.h"
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
|
#include "filenames.h"
|
||||||
#include "frame.h"
|
#include "frame.h"
|
||||||
#include "regcache.h"
|
#include "regcache.h"
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
|
@ -30,6 +31,7 @@
|
||||||
#include "inferior.h" /* for get_exec_file */
|
#include "inferior.h" /* for get_exec_file */
|
||||||
#include "gdbthread.h"
|
#include "gdbthread.h"
|
||||||
#include "gdbsupport/pathstuff.h"
|
#include "gdbsupport/pathstuff.h"
|
||||||
|
#include "gdbsupport/gdb_tilde_expand.h"
|
||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <kvm.h>
|
#include <kvm.h>
|
||||||
|
@ -47,7 +49,7 @@
|
||||||
#include "bsd-kvm.h"
|
#include "bsd-kvm.h"
|
||||||
|
|
||||||
/* Kernel memory device file. */
|
/* Kernel memory device file. */
|
||||||
static const char *bsd_kvm_corefile;
|
static std::string bsd_kvm_corefile;
|
||||||
|
|
||||||
/* Kernel memory interface descriptor. */
|
/* Kernel memory interface descriptor. */
|
||||||
static kvm_t *core_kd;
|
static kvm_t *core_kd;
|
||||||
|
@ -109,24 +111,19 @@ bsd_kvm_target_open (const char *arg, int from_tty)
|
||||||
char errbuf[_POSIX2_LINE_MAX];
|
char errbuf[_POSIX2_LINE_MAX];
|
||||||
const char *execfile = NULL;
|
const char *execfile = NULL;
|
||||||
kvm_t *temp_kd;
|
kvm_t *temp_kd;
|
||||||
char *filename = NULL;
|
std::string filename;
|
||||||
|
|
||||||
target_preopen (from_tty);
|
target_preopen (from_tty);
|
||||||
|
|
||||||
if (arg)
|
if (arg)
|
||||||
{
|
{
|
||||||
filename = tilde_expand (arg);
|
filename = gdb_tilde_expand (arg);
|
||||||
if (filename[0] != '/')
|
if (!IS_ABSOLUTE_PATH (filename))
|
||||||
{
|
filename = gdb_abspath (filename.c_str ());
|
||||||
gdb::unique_xmalloc_ptr<char> temp (gdb_abspath (filename));
|
|
||||||
|
|
||||||
xfree (filename);
|
|
||||||
filename = temp.release ();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
execfile = get_exec_file (0);
|
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);
|
write_files ? O_RDWR : O_RDONLY, errbuf);
|
||||||
if (temp_kd == NULL)
|
if (temp_kd == NULL)
|
||||||
error (("%s"), errbuf);
|
error (("%s"), errbuf);
|
||||||
|
@ -155,6 +152,7 @@ bsd_kvm_target::close ()
|
||||||
core_kd = NULL;
|
core_kd = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bsd_kvm_corefile.clear ();
|
||||||
switch_to_no_thread ();
|
switch_to_no_thread ();
|
||||||
exit_inferior_silent (current_inferior ());
|
exit_inferior_silent (current_inferior ());
|
||||||
}
|
}
|
||||||
|
@ -203,9 +201,9 @@ bsd_kvm_target::xfer_partial (enum target_object object,
|
||||||
void
|
void
|
||||||
bsd_kvm_target::files_info ()
|
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"),
|
gdb_printf (_("\tUsing the kernel crash dump %s.\n"),
|
||||||
bsd_kvm_corefile);
|
bsd_kvm_corefile.c_str ());
|
||||||
else
|
else
|
||||||
gdb_printf (_("\tUsing the currently running kernel.\n"));
|
gdb_printf (_("\tUsing the currently running kernel.\n"));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue