From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Thu, 14 Apr 2022 00:03:18 +0000 (-0400)
Subject: gdb: call gdb_tilde_expand instead of gdb_tilde_expand_up in source_script_with_search
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e0c34637019b0a070780b57b50d9026c0aca16f4;p=binutils-gdb.git

gdb: call gdb_tilde_expand instead of gdb_tilde_expand_up in source_script_with_search

This removes a use of gdb_tilde_expand_up, which is removed later in
this series.

Change-Id: I5887d526cea987103e4ca24514a982b0a28e992a
---

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 424a8740706..2b4becc97b2 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -749,13 +749,13 @@ source_script_with_search (const char *file, int from_tty, int search_path)
      this if we (may have) used search_path, as printing the full path in
      errors for the non-search case can be more noise than signal.  */
   const char *file_to_open;
-  gdb::unique_xmalloc_ptr<char> tilde_expanded_file;
+  std::string tilde_expanded_file;
   if (search_path)
     file_to_open = opened->full_path.get ();
   else
     {
-      tilde_expanded_file = gdb_tilde_expand_up (file);
-      file_to_open = tilde_expanded_file.get ();
+      tilde_expanded_file = gdb_tilde_expand (file);
+      file_to_open = tilde_expanded_file.c_str ();
     }
   source_script_from_stream (opened->stream.get (), file, file_to_open);
 }