Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
To: gdb-patches ml <gdb-patches@sourceware.org>
Subject: [patch] Expand tildes in solib-search-path entries.
Date: Tue, 22 May 2012 18:17:00 -0000	[thread overview]
Message-ID: <1337710624.19373.9.camel@hactar> (raw)

Hello,

GDB will expand the tilde when using the "set directories", "set
sysroot", "source" and "file" commands, possibly others. But it doesn't
expand the tilde on "set solib-search-path". This made me lose some time
wondering what was going on when I was debugging another issue.

This patch fixes it. "set directories" expands the tilde in a much more
elaborate way by calling mod_path which calls add_path. "set sysroot",
"source" and "file" just call tilde_expand like I do here.

There are no regressions in i386-linux. Ok?

-- 
[]'s
Thiago Jung Bauermann
Linaro Toolchain Working Group


2012-05-22  Thiago Jung Bauermann  <thiago.bauermann@linaro.org>

	* source.c (openp): Expand tilde in path entries.


diff --git a/gdb/source.c b/gdb/source.c
index 27c5b0e..af68ebd 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -771,8 +771,28 @@ openp (const char *path, int opts, const char *string,
 	}
       else
 	{
-	  /* Normal file name in path -- just use it.  */
-	  strcpy (filename, dir);
+	  /* See whether we need to expand the tilde.  */
+	  if (strchr(dir, '~'))
+	    {
+	      int newlen;
+	      char *tilde_expanded;
+
+	      tilde_expanded  = tilde_expand (dir);
+
+	      /* First, realloc the filename buffer if too short.  */
+	      len = strlen (tilde_expanded);
+	      newlen = len + strlen (string) + 2;
+	      if (newlen > alloclen)
+		{
+		  alloclen = newlen;
+		  filename = alloca (alloclen);
+		}
+	      strcpy (filename, tilde_expanded);
+	      xfree (tilde_expanded);
+	    }
+	  else
+	    /* Normal file name in path -- just use it.  */
+	    strcpy (filename, dir);
 
 	  /* Don't search $cdir.  It's also a magic path like $cwd, but we
 	     don't have enough information to expand it.  The user *could*



             reply	other threads:[~2012-05-22 18:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-22 18:17 Thiago Jung Bauermann [this message]
2012-05-24 15:31 ` Pedro Alves
2012-05-30  3:44   ` Thiago Jung Bauermann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337710624.19373.9.camel@hactar \
    --to=thiago.bauermann@linaro.org \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox