binutils-gdb/gdb/common/gdb_tilde_expand.c

96 lines
2.5 KiB
C
Raw Normal View History

/* Perform tilde expansion on paths for GDB and gdbserver.
Copyright (C) 2017-2018 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 "common-defs.h"
#include "gdb_tilde_expand.h"
#include <glob.h>
/* RAII-style class wrapping "glob". */
class gdb_glob
{
public:
/* Construct a "gdb_glob" object by calling "glob" with the provided
parameters. This function can throw if "glob" fails. */
gdb_glob (const char *pattern, int flags,
int (*errfunc) (const char *epath, int eerrno))
{
int ret = glob (pattern, flags, errfunc, &m_glob);
if (ret != 0)
{
if (ret == GLOB_NOMATCH)
error (_("Could not find a match for '%s'."), pattern);
else
error (_("glob could not process pattern '%s'."),
pattern);
}
}
/* Destroy the object and free M_GLOB. */
~gdb_glob ()
{
globfree (&m_glob);
}
/* Return the GL_PATHC component of M_GLOB. */
int pathc () const
{
return m_glob.gl_pathc;
}
/* Return the GL_PATHV component of M_GLOB. */
char **pathv () const
{
return m_glob.gl_pathv;
}
private:
/* The actual glob object we're dealing with. */
glob_t m_glob;
};
/* See common/gdb_tilde_expand.h. */
std::string
gdb_tilde_expand (const char *dir)
{
gdb_glob glob (dir, GLOB_TILDE_CHECK, NULL);
gdb_assert (glob.pathc () > 0);
/* "glob" may return more than one match to the path provided by the
user, but we are only interested in the first match. */
std::string expanded_dir = glob.pathv ()[0];
return expanded_dir;
}
Create new common/pathstuff.[ch] This commit moves the path manipulation routines found on utils.c to a new common/pathstuff.c, and updates the Makefile.in's accordingly. The routines moved are "gdb_realpath", "gdb_realpath_keepfile" and "gdb_abspath". This will be needed because gdbserver will have to call "gdb_abspath" on my next patch, which implements a way to expand the path of the inferior provided by the user in order to allow specifying just the binary name when starting gdbserver, like: $ gdbserver :1234 a.out With the recent addition of the startup-with-shell feature on gdbserver, this scenario doesn't work anymore if the user doesn't have the current directory listed in the PATH variable. I had to do a minor adjustment on "gdb_abspath" because we don't have access to "tilde_expand" on gdbserver, so now the function is using "gdb_tilde_expand" instead. Otherwise, the code is the same. Regression tested on the BuildBot, without regressions. gdb/ChangeLog: 2018-02-28 Sergio Durigan Junior <sergiodj@redhat.com> * Makefile.in (COMMON_SFILES): Add "common/pathstuff.c". (HFILES_NO_SRCDIR): Add "common/pathstuff.h". * auto-load.c: Include "common/pathstuff.h". * common/common-def.h (current_directory): Move here. * common/gdb_tilde_expand.c (gdb_tilde_expand_up): New function. * common/gdb_tilde_expand.h (gdb_tilde_expand_up): New prototype. * common/pathstuff.c: New file. * common/pathstuff.h: New file. * compile/compile.c: Include "common/pathstuff.h". * defs.h (current_directory): Move to "common/common-defs.h". * dwarf2read.c: Include "common/pathstuff.h". * exec.c: Likewise. * guile/scm-safe-call.c: Likewise. * linux-thread-db.c: Likewise. * main.c: Likewise. * nto-tdep.c: Likewise. * objfiles.c: Likewise. * source.c: Likewise. * symtab.c: Likewise. * utils.c: Include "common/pathstuff.h". (gdb_realpath): Move to "common/pathstuff.c". (gdb_realpath_keepfile): Likewise. (gdb_abspath): Likewise. * utils.h (gdb_realpath): Move to "common/pathstuff.h". (gdb_realpath_keepfile): Likewise. (gdb_abspath): Likewise. gdb/gdbserver/ChangeLog: 2018-02-28 Sergio Durigan Junior <sergiodj@redhat.com> * Makefile.in (SFILES): Add "$(srcdir)/common/pathstuff.c". (OBJS): Add "pathstuff.o". * server.c (current_directory): New global variable. (captured_main): Initialize "current_directory".
2018-02-10 07:44:59 +08:00
/* See common/gdb_tilde_expand.h. */
gdb::unique_xmalloc_ptr<char>
gdb_tilde_expand_up (const char *dir)
{
gdb_glob glob (dir, GLOB_TILDE_CHECK, NULL);
gdb_assert (glob.pathc () > 0);
/* "glob" may return more than one match to the path provided by the
user, but we are only interested in the first match. */
return gdb::unique_xmalloc_ptr<char> (xstrdup (glob.pathv ()[0]));
}